diff --git a/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings b/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings
index 5c4c862583..b65133fbb0 100644
--- a/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings
+++ b/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="es3:2,ios:2,osx_gl:0,pc:0,provo:0"
\ No newline at end of file
+/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="android:2,ios:2,mac:0,pc:0,provo:0"
\ No newline at end of file
diff --git a/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings b/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings
index 441a11bc68..e8da408b36 100644
--- a/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings
+++ b/AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /preset=Albedo /reduce="es3:3,ios:3,osx_gl:0,pc:0,provo:0"
\ No newline at end of file
+/autooptimizefile=0 /preset=Albedo /reduce="android:3,ios:3,mac:0,pc:0,provo:0"
\ No newline at end of file
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
index 818dc23079..ecf08cfcbd 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
@@ -31,13 +31,13 @@ class TestPythonAssetProcessing(object):
         unexpected_lines = []
         expected_lines = [
             'Mock asset exists',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel) found',
-            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel) found'
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel) found',
+            'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel) found'
         ]
         timeout = 180
         halt_on_unexpected = False
diff --git a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
index cd9adfdbcf..a7907778b2 100644
--- a/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
+++ b/AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
@@ -38,16 +38,16 @@ def test_azmodel_product(generatedModelAssetPath, expectedSubId):
     assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False)
     assetIdString = assetId.to_string()
     if (assetIdString.endswith(':' + expectedSubId) is False):
-        raise_and_stop(f'Asset has unexpected asset ID ({assetIdString}) for ({generatedModelAssetPath})!')
+        raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString}) for ({generatedModelAssetPath}), expected {expectedSubId}!')
     else:
         print(f'Expected subId for asset ({generatedModelAssetPath}) found')
 
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel', '10315ae0')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel', '10661093')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel', '10af8810')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel', '10f8c263')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel', '100ac47f')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel', '105d8e0c')
-test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel', '1002d464')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel', '1024be55')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel', '1052c94e')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel', '10130556')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel', '1065724d')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel', '10d16e68')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel', '10a71973')
+test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel', '10412075')
 
 azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
index e729ee9882..9a5b93ca80 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py
@@ -34,10 +34,10 @@ def ap_all_platforms_setup_fixture(request, workspace, ap_setup_fixture) -> Dict
 
     # Specific platform cache locations
     resources["pc_cache_location"] = os.path.join(cache_dir, "pc")
-    resources["es3_cache_location"] = os.path.join(cache_dir, "es3")
+    resources["android_cache_location"] = os.path.join(cache_dir, "android")
     resources["ios_cache_location"] = os.path.join(cache_dir, "ios")
-    resources["osx_gl_cache_location"] = os.path.join(cache_dir, "osx_gl")
+    resources["mac_cache_location"] = os.path.join(cache_dir, "mac")
     resources["provo_cache_location"] = os.path.join(cache_dir, "provo")
-    resources["all_platforms"] = ["pc", "es3", "ios", "osx_gl", "provo"]
+    resources["all_platforms"] = ["pc", "android", "ios", "mac", "provo"]
 
     return resources
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
index 580816e7b5..7a85cb1813 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py
@@ -54,7 +54,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
         platforms = [platform.strip() for platform in platforms.split(",")]
     else:
         # No commandline argument provided, default to mac and pc
-        platforms = ["pc", "osx_gl"]
+        platforms = ["pc", "mac"]
 
     class BundlerBatchFixture:
         """
@@ -241,11 +241,11 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
         def get_platform_flag(self, platform_name: str) -> int:
             if (platform_name == "pc"):
                 return 1
-            elif (platform_name == "es3"):
+            elif (platform_name == "android"):
                 return 2
             elif (platform_name == "ios"):
                 return 4
-            elif (platform_name == "osx_gl"):
+            elif (platform_name == "mac"):
                 return 8
             elif (platform_name == "server"):
                 return 128
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
index d236e87aa2..8738e8acdf 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py
@@ -460,9 +460,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         """
         helper = bundler_batch_helper
         # fmt:off
-        assert "pc" in helper["platforms"] and "osx_gl" in helper["platforms"], \
+        assert "pc" in helper["platforms"] and "mac" in helper["platforms"], \
             "This test requires both PC and MAC platforms to be enabled. " \
-            "Please rerun with commandline option: '--bundle_platforms=pc,osx_gl'"
+            "Please rerun with commandline option: '--bundle_platforms=pc,mac'"
         # fmt:on
 
         seed_list = os.path.join(workspace.paths.engine_root(), "Engine", "SeedAssetList.seed")  # Engine seed list
@@ -502,7 +502,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         for bundle_file in bundle_files.values():
             assert os.path.isfile(bundle_file)
 
-        # This asset is created on osx_gl platform but not on windows
+        # This asset is created on mac platform but not on windows
         file_to_check = b"engineassets/shading/defaultprobe_cm.dds.5"  # [use byte str because file is in binary]
 
         # Extract the delta catalog file from pc archive. {file_to_check} SHOULD NOT be present for PC
@@ -512,11 +512,11 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             f"{file_to_check} was found in DeltaCatalog.xml in pc bundle file {bundle_files['pc']}"
         # fmt:on
 
-        # Extract the delta catalog file from osx_gl archive. {file_to_check} SHOULD be present for MAC
-        file_contents = helper.extract_file_content(bundle_files["osx_gl"], "DeltaCatalog.xml")
+        # Extract the delta catalog file from mac archive. {file_to_check} SHOULD be present for MAC
+        file_contents = helper.extract_file_content(bundle_files["mac"], "DeltaCatalog.xml")
         # fmt:off
         assert file_to_check in file_contents, \
-            f"{file_to_check} was not found in DeltaCatalog.xml in darwin bundle file {bundle_files['osx_gl']}"
+            f"{file_to_check} was not found in DeltaCatalog.xml in darwin bundle file {bundle_files['mac']}"
         # fmt:on
 
         # Gather checksums for first set of bundles
@@ -613,7 +613,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             addSeed=test_asset,
-            platform="pc,osx_gl",
+            platform="pc,mac",
         )
 
         # Validate both mac and pc are activated for seed
@@ -626,7 +626,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             removePlatformFromSeeds="",
-            platform="osx_gl",
+            platform="mac",
         )
         # Validate only pc platform for seed. Save file contents to variable
         all_lines = check_seed_platform(helper["seed_list_file"], test_asset, helper["platform_values"]["pc"])
@@ -646,7 +646,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             addPlatformToSeeds="",
-            platform="osx_gl",
+            platform="mac",
         )
         # Validate Mac platform was added back on. Save file contents
         # fmt:off
@@ -670,7 +670,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             removeSeed=test_asset,
-            platform="pc,osx_gl",
+            platform="pc,mac",
         )
 
         # Validate seed was removed from file
@@ -697,9 +697,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         env = ap_setup_fixture
 
         # fmt:off
-        assert "pc" in helper["platforms"] and "osx_gl" in helper["platforms"], \
+        assert "pc" in helper["platforms"] and "mac" in helper["platforms"], \
             "This test requires both PC and MAC platforms to be enabled. " \
-            "Please rerun with commandline option: '--bundle_platforms=pc,osx_gl'"
+            "Please rerun with commandline option: '--bundle_platforms=pc,mac'"
         # fmt:on
 
         # Test assets arranged in common lists: six (0-5) .txt files and .dat files
@@ -717,16 +717,16 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         file_platforms = {
             "txtfile_0.txt": "pc",
             "txtfile_1.txt": "pc",
-            "txtfile_2.txt": "pc,osx_gl",
-            "txtfile_3.txt": "pc,osx_gl",
-            "txtfile_4.txt": "osx_gl",
-            "txtfile_5.txt": "osx_gl",
+            "txtfile_2.txt": "pc,mac",
+            "txtfile_3.txt": "pc,mac",
+            "txtfile_4.txt": "mac",
+            "txtfile_5.txt": "mac",
             "datfile_0.dat": "pc",
             "datfile_1.dat": "pc",
-            "datfile_2.dat": "pc,osx_gl",
-            "datfile_3.dat": "pc,osx_gl",
-            "datfile_4.dat": "osx_gl",
-            "datfile_5.dat": "osx_gl",
+            "datfile_2.dat": "pc,mac",
+            "datfile_3.dat": "pc,mac",
+            "datfile_4.dat": "mac",
+            "datfile_5.dat": "mac",
         }
 
         # Comparison rules files and their associated 'comparisonType' flags
@@ -741,7 +741,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
 
         # Get our test assets ready and processed
         utils.prepare_test_assets(env["tests_dir"], "C16877178", env["project_test_assets_dir"])
-        asset_processor.batch_process(timeout=timeout, fastscan=False, platforms="pc,osx_gl")
+        asset_processor.batch_process(timeout=timeout, fastscan=False, platforms="pc,mac")
 
         # *** Some helper functions *** #
 
@@ -759,7 +759,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             helper.call_assetLists(
                 assetListFile=os.path.join(helper["test_dir"], asset_list_file_name),
                 seedListFile=os.path.join(helper["test_dir"], seed_file_name),
-                platform="pc,osx_gl",
+                platform="pc,mac",
             )
 
         def get_platform_assets(asset_name_list: List[str]) -> Dict[str, List[str]]:
@@ -769,7 +769,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             for asset_name in asset_name_list:
                 if "pc" in file_platforms[asset_name]:
                     win_assets.append(asset_name)
-                if "osx_gl" in file_platforms[asset_name]:
+                if "mac" in file_platforms[asset_name]:
                     mac_assets.append(asset_name)
             return {"win": win_assets, "mac": mac_assets}
 
@@ -798,7 +798,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
 
             # Get platform result file names
             win_asset_list_file = helper.platform_file_name(request_file, platforms["pc"])
-            mac_asset_list_file = helper.platform_file_name(request_file, platforms["osx_gl"])
+            mac_asset_list_file = helper.platform_file_name(request_file, platforms["mac"])
 
             # Get expected platforms for each asset in asset_names
             platform_files = get_platform_assets(asset_names)
@@ -879,14 +879,14 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                 # fmt:on
             # End verify_asset_list_contents()
 
-            def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_osx_gl_output: bool) -> None:
+            def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_mac_output: bool) -> None:
                 # Expected asset list to equal result of comparison
                 expected_pc_asset_list = None
-                expected_osx_gl_asset_list = None
+                expected_mac_asset_list = None
 
                 # Last output file. Use this for comparison to 'expected'
                 output_pc_asset_list = None
-                output_osx_gl_asset_list = None
+                output_mac_asset_list = None
 
                 # Add the platform to the file name to match what the Bundler will create
                 last_output_arg = output_arg.split(",")[-1]
@@ -895,10 +895,10 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     expected_pc_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
                     output_pc_asset_list = helper.platform_file_name(last_output_arg, platform)
 
-                if expect_osx_gl_output:
-                    platform = platforms["osx_gl"]
-                    expected_osx_gl_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
-                    output_osx_gl_asset_list = helper.platform_file_name(last_output_arg, platform)
+                if expect_mac_output:
+                    platform = platforms["mac"]
+                    expected_mac_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
+                    output_mac_asset_list = helper.platform_file_name(last_output_arg, platform)
 
                 # Build execution command
                 cmd = generate_compare_command(platform_arg)
@@ -911,15 +911,15 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     verify_asset_list_contents(expected_pc_asset_list, output_pc_asset_list)
                     fs.delete([output_pc_asset_list], True, True)
 
-                if expect_osx_gl_output:
-                    verify_asset_list_contents(expected_osx_gl_asset_list, output_osx_gl_asset_list)
-                    fs.delete([output_osx_gl_asset_list], True, True)
+                if expect_mac_output:
+                    verify_asset_list_contents(expected_mac_asset_list, output_mac_asset_list)
+                    fs.delete([output_mac_asset_list], True, True)
             # End run_compare_command_and_verify()
 
             # Generate command, run and validate for each platform
             run_compare_command_and_verify("pc", True, False)
-            run_compare_command_and_verify("osx_gl", False, True)
-            run_compare_command_and_verify("pc,osx_gl", True, True)
+            run_compare_command_and_verify("mac", False, True)
+            run_compare_command_and_verify("pc,mac", True, True)
             #run_compare_command_and_verify(None, True, True)
 
         # End compare_and_check()
diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
index 50b3af1438..0d830b39e2 100755
--- a/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
+++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py
@@ -102,7 +102,7 @@ class TestsAssetProcessorBatch_AllPlatforms(object):
     def test_RunAPBatch_TwoPlatforms_ExitCodeZero(self, asset_processor):
         asset_processor.create_temp_asset_root()
         asset_processor.enable_asset_processor_platform("pc")
-        asset_processor.enable_asset_processor_platform("osx_gl")
+        asset_processor.enable_asset_processor_platform("mac")
         result, _ = asset_processor.batch_process()
         assert result, "AP Batch failed"
 
diff --git a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
index e8f3349df4..834254134e 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/editor/CMakeLists.txt
@@ -39,4 +39,19 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
         COMPONENT
             Editor
     )
+
+    ly_add_pytest(
+        NAME AutomatedTesting::EditorTests_Sandbox
+        TEST_SUITE sandbox
+        TEST_SERIAL
+        PATH ${CMAKE_CURRENT_LIST_DIR}
+        PYTEST_MARKS "SUITE_sandbox"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+            Legacy::Editor
+            AZ::AssetProcessor
+            AutomatedTesting.Assets
+        COMPONENT
+            Editor
+    )
 endif()
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
index c2d515e250..f887560a19 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Docking.py
@@ -39,7 +39,7 @@ class TestDocking(object):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
     @pytest.mark.test_case_id("C6376081")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_sandbox
     def test_Docking_BasicDockedTools(self, request, editor, level, launcher_platform):
         expected_lines = [
             "The tools are all docked together in a tabbed widget",
diff --git a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
index 70a22f9e2a..c2da1343de 100644
--- a/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
+++ b/AutomatedTesting/Gem/PythonTests/editor/test_Menus.py
@@ -39,7 +39,7 @@ class TestMenus(object):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
     @pytest.mark.test_case_id("C16780783", "C2174438")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_sandbox
     def test_Menus_EditMenuOptions_Work(self, request, editor, level, launcher_platform):
         expected_lines = [
             "Undo Action triggered",
@@ -113,7 +113,7 @@ class TestMenus(object):
         )
 
     @pytest.mark.test_case_id("C16780778")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_sandbox
     def test_Menus_FileMenuOptions_Work(self, request, editor, level, launcher_platform):
         expected_lines = [
             "New Level Action triggered",
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
index 72e3bec3df..c7fd43c7b2 100644
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/CMakeLists.txt
@@ -13,22 +13,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
 
 ## DynVeg ##
 
-    # Temporarily moving all tests to periodic suite - SPEC-6553
-    #ly_add_pytest(
-    #    NAME AutomatedTesting::DynamicVegetationTests_Main
-    #    TEST_SERIAL
-    #    TEST_SUITE main
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
-    #    PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-    #    TIMEOUT 1500
-    #    RUNTIME_DEPENDENCIES
-    #        AZ::AssetProcessor
-    #        Legacy::Editor
-    #        AutomatedTesting.GameLauncher
-    #        AutomatedTesting.Assets
-    #    COMPONENT
-    #        LargeWorlds
-    #)
+    ly_add_pytest(
+        NAME AutomatedTesting::DynamicVegetationTests_Main
+        TEST_SERIAL
+        TEST_SUITE main
+        PATH ${CMAKE_CURRENT_LIST_DIR}/dyn_veg
+        PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+            AZ::AssetProcessor
+            Legacy::Editor
+            AutomatedTesting.GameLauncher
+            AutomatedTesting.Assets
+        COMPONENT
+            LargeWorlds
+    )
 
 
     ly_add_pytest(
@@ -137,21 +136,21 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_
             LargeWorlds
     )
 ## LandscapeCanvas ##
-    # Temporarily moving all tests to periodic suite - SPEC-6553
-    #ly_add_pytest(
-    #    NAME AutomatedTesting::LandscapeCanvasTests_Main
-    #    TEST_SERIAL
-    #    TEST_SUITE main
-    #    PATH ${CMAKE_CURRENT_LIST_DIR}/largeworlds/landscape_canvas
-    #    PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
-    #    TIMEOUT 1500
-    #    RUNTIME_DEPENDENCIES
-    #       AZ::AssetProcessor
-    #       Legacy::Editor
-    #       AutomatedTesting.Assets
-    #    COMPONENT
-    #        LargeWorlds
-    #)
+
+    ly_add_pytest(
+        NAME AutomatedTesting::LandscapeCanvasTests_Main
+        TEST_SERIAL
+        TEST_SUITE main
+        PATH ${CMAKE_CURRENT_LIST_DIR}/landscape_canvas
+        PYTEST_MARKS "not SUITE_sandbox and not SUITE_periodic and not SUITE_benchmark"
+        TIMEOUT 1500
+        RUNTIME_DEPENDENCIES
+           AZ::AssetProcessor
+           Legacy::Editor
+           AutomatedTesting.Assets
+        COMPONENT
+            LargeWorlds
+    )
 
     ly_add_pytest(
         NAME AutomatedTesting::LandscapeCanvasTests_Periodic
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
index 4f58a23a19..730a557a9e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/SurfaceMaskFilter_BasicSurfaceTagCreation.py
@@ -23,6 +23,25 @@ class TestSurfaceMaskFilter_BasicSurfaceTagCreation(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="TestSurfaceMaskFilter_BasicSurfaceTagCreation", args=["level"])
         
     def run_test(self):
+        """
+        Summary:
+        Verifies basic surface tag value equality
+
+        Expected Behavior:
+        Surface tags of the same name are equal, and different names aren't.
+
+        Test Steps:
+         1) Open level
+         2) Create 2 new surface tags of identical names and verify they resolve as equal.
+         3) Create another new tag of a different name and verify they resolve as different.
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         self.log("SurfaceTag test started")
         
         # Create a level
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
index c25761d655..46c5483988 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/VegetationInstances_DespawnWhenOutOfRange.py
@@ -33,6 +33,25 @@ class TestVegetationInstances_DespawnWhenOutOfRange(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix='VegetationInstances_DespawnWhenOutOfRange', args=['level'])
 
     def run_test(self):
+        """
+        Summary:
+        Verifies that vegetation instances properly spawn/despawn based on camera range.
+
+        Expected Behavior:
+        Vegetation instances despawn when out of camera range.
+
+        Test Steps:
+         1) Create a new level
+         2) Create a simple vegetation area, and set the view position near the spawner. Verify instances plant.
+         3) Move the view position away from the spawner. Verify instances despawn.
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         # Create a new level
         self.test_success = self.create_level(
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
index 9898570692..ead1e8779c 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py
@@ -41,7 +41,7 @@ class TestDynamicSliceInstanceSpawner(object):
         return console
 
     @pytest.mark.test_case_id("C28851763")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_main
     @pytest.mark.dynveg_area
     @pytest.mark.parametrize("launcher_platform", ['windows_editor'])
     def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, editor, level, workspace, project,
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
index 7bd8484cf4..ca71cd2137 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py
@@ -37,7 +37,7 @@ class TestEmptyInstanceSpawner(object):
         file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True)
 
     @pytest.mark.test_case_id("C28851762")
-    @pytest.mark.SUITE_periodic
+    @pytest.mark.SUITE_main
     @pytest.mark.dynveg_area
     def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, editor, level, launcher_platform):
         cfg_args = [level]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
index cc9a15bba0..c37bc9780f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientGenerators_Incompatibilities.py
@@ -28,8 +28,21 @@ class TestGradientGeneratorIncompatibilities(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Verify that Entities are not active when a Gradient Generator and incompatible component are both present
-        on the same Entity.
+        This test verifies that components are disabled when conflicting components are present on the same entity.
+
+        Expected Behavior:
+        Gradient Generator components are incompatible with Vegetation area components.
+
+        Test Steps:
+         1) Create a new level
+         2) Create a new entity in the level
+         3) Add each Gradient Generator component to an entity, and add a Vegetation Area component to the same entity
+         4) Verify that components are only enabled when entity is free of a conflicting component
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
index b7d12d074a..f2edc2924e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientModifiers_Incompatibilities.py
@@ -28,8 +28,21 @@ class TestGradientModifiersIncompatibilities(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Verify that Entities are not active when a Gradient Modifier and incompatible component are both present
-        on the same Entity.
+        This test verifies that components are disabled when conflicting components are present on the same entity.
+
+        Expected Behavior:
+        Gradient Modifier components are incompatible with Vegetation area components.
+
+        Test Steps:
+         1) Create a new level
+         2) Create a new entity in the level
+         3) Add each Gradient Modifier component to an entity, and add a Vegetation Area component to the same entity
+         4) Verify that components are only enabled when entity is free of a conflicting component
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
index c37ee36265..45da74d6cd 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_ClearingPinnedEntitySetsPreviewToOrigin.py
@@ -9,19 +9,6 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-"""
-The below cases are combined in this script
-C2676829
-C3961326
-C3980659
-C3980664
-C3980669
-C3416548
-C2676823
-C3961321
-C2676826
-"""
-
 import os
 import sys
 
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
index 5a758b9d89..b8f4114d30 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientPreviewSettings_DefaultPinnedEntityIsSelf.py
@@ -44,7 +44,21 @@ class TestGradientPreviewSettings(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Verify if the current entity is set to the pin preview to shape entity by default for several components.
+        This test verifies default values for the pinned entity for Gradient Preview settings.
+
+        Expected Behavior:
+        Pinned entity is self for all gradient generator/modifiers.
+
+        Test Steps:
+         1) Create a new level
+         2) Create a new entity in the level
+         3) Add each Gradient Generator component to an entity, and verify the Pin Preview to Shape property is set to
+         self
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
index a16e37e0fc..8e2d0611af 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientSurfaceTagEmitter_ComponentDependencies.py
@@ -31,11 +31,21 @@ class TestGradientSurfaceTagEmitterDependencies(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Component has a dependency on a Gradient component
+        This test verifies that the Gradient Surface Tag Emitter component is dependent on a gradient component.
 
         Expected Result:
-        Component is disabled until a Gradient Generator, Modifier or Gradient Reference component
-        (and any sub-dependencies) is added to the entity.
+        Gradient Surface Tag Emitter component is disabled until a Gradient Generator, Modifier or Gradient Reference
+        component (and any sub-dependencies) is added to the entity.
+
+        Test Steps:
+         1) Open level
+         2) Create a new entity with a Gradient Surface Tag Emitter component
+         3) Verify the component is disabled until a dependent component is also added to the entity
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
index e1e901f2f7..2311363db9 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/GradientTransform_RequiresShape.py
@@ -28,8 +28,20 @@ class TestGradientTransformRequiresShape(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Verify that Gradient Transform Modifier component requires a
-        Shape component before the Entity can become active.
+        This test verifies that the Gradient Transform Modifier component is dependent on a shape component.
+
+        Expected Result:
+        Gradient Transform Modifier component is disabled until a shape component is added to the entity.
+
+        Test Steps:
+         1) Open level
+         2) Create a new entity with a Gradient Transform Modifier component
+         3) Verify the component is disabled until a shape component is also added to the entity
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
index dab8e6928a..a5d9632fd6 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/gradient_signal/EditorScripts/ImageGradient_RequiresShape.py
@@ -28,8 +28,20 @@ class TestImageGradientRequiresShape(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        Verify that Image Gradient component requires a
-        Shape component before the Entity can become active.
+        This test verifies that the Image Gradient component is dependent on a shape component.
+
+        Expected Result:
+        Gradient Transform Modifier component is disabled until a shape component is added to the entity.
+
+        Test Steps:
+         1) Open level
+         2) Create a new entity with a Image Gradient component
+         3) Verify the component is disabled until a shape component is also added to the entity
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
 
         :return: None
         """
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
index d1e0b68ef4..c41d153cfa 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_DependentComponentsAdded.py
@@ -33,6 +33,26 @@ class TestAreaNodeComponentDependency(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="AreaNodeComponentDependency", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities with
+        proper dependent components.
+
+        Expected Behavior:
+        All expected component dependencies are met when adding an area node to a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the area nodes to the graph area, and ensure the proper dependent components are added
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
index 4e429a192b..fb977b4987 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityCreatedOnNodeAdd.py
@@ -33,7 +33,25 @@ class TestGradientNodeEntityCreate(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="AreaNodeEntityCreate", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities.
 
+        Expected Behavior:
+        New entities are created when dragging area nodes to graph area.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the area nodes to the graph area, and ensure a new entity is created
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         def onEntityCreated(parameters):
             global newEntityId
             newEntityId = parameters[0]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
index 38f8641b4c..57ba8fc006 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/AreaNodes_EntityRemovedOnNodeDelete.py
@@ -34,7 +34,26 @@ class TestAreaNodeEntityDelete(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="AreaNodeEntityDelete", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas node deletion properly cleans up entities in the Editor.
 
+        Expected Behavior:
+        Entities are removed when area nodes are deleted from a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the area nodes to the graph area, and ensure a new entity is created
+         4) Delete the nodes, and ensure the newly created entities are removed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         def onEntityCreated(parameters):
             global createdEntityId
             createdEntityId = parameters[0]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
index 26062c01f8..60527b64d2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ComponentUpdates_UpdateGraph.py
@@ -9,24 +9,6 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-
-"""
-C22602072 - Graph is updated when underlying components are added/removed
-
-1. Open Level.
-2. Find LandscapeCanvas named entity.
-3. Ensure Vegetation Distribution Component is present on the BushSpawner entity.
-4. Open graph and ensure Distribution Filter wrapped node is present.
-5. Delete the Vegetation Distribution Filter component from the BushSpawner entity via Entity Inspector.
-6. Ensure the Vegetation Distribution Filter component was deleted from the BushSpawner entity and node is no longer 
-present in the graph.
-7. Add Vegetation Altitude Filter to the BushSpawner entity through Entity Inspector.
-8. Ensure Altitude Filter was added to the BushSpawner node in the open graph.
-9. Add a new entity with unique name as a child of the Landscape Canvas entity.
-10. Add a Box Shape component to the new child entity.
-11. Ensure Box Shape node is present on the open graph.
-"""
-
 import os
 import sys
 
@@ -50,6 +32,36 @@ class TestComponentUpdatesUpdateGraph(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="ComponentUpdatesUpdateGraph", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas graphs update properly when components are added/removed outside of
+        Landscape Canvas.
+
+        Expected Behavior:
+        Graphs properly reflect component changes made to entities outside of Landscape Canvas.
+
+        Test Steps:
+            1. Open Level
+            2. Find LandscapeCanvas named entity
+            3. Ensure Vegetation Distribution Component is present on the BushSpawner entity
+            4. Open graph and ensure Distribution Filter wrapped node is present
+            5. Delete the Vegetation Distribution Filter component from the BushSpawner entity via Entity Inspector
+            6. Ensure the Vegetation Distribution Filter component was deleted from the BushSpawner entity and node is
+            no longer present in the graph
+            7. Add Vegetation Altitude Filter to the BushSpawner entity through Entity Inspector
+            8. Ensure Altitude Filter was added to the BushSpawner node in the open graph
+            9. Add a new entity with unique name as a child of the Landscape Canvas entity
+            10. Add a Box Shape component to the new child entity
+            11. Ensure Box Shape node is present on the open graph
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
+
         # Create a new empty level and instantiate LC_BushFlowerBlender.slice
         self.test_success = self.create_level(
             self.args["level"],
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
index 5fed13985d..4b5e03abbc 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/CreateNewGraph.py
@@ -37,6 +37,25 @@ class TestCreateNewGraph(EditorTestHelper):
         print("New root entity created")
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that new graphs can be created in Landscape Canvas.
+
+        Expected Behavior:
+        New graphs can be created, and proper entity is created to hold graph data with a Landscape Canvas component.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Ensures the root entity created contains a Landscape Canvas component
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         self.test_success = self.create_level(
             self.args["level"],
             heightmap_resolution=128,
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
index 7fd3f075e0..81e24b20e1 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_DisabledNodeDuplication.py
@@ -33,7 +33,25 @@ class TestDisabledNodeDuplication(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="DisabledNodeDuplication", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies Editor stability after duplicating disabled Landscape Canvas nodes.
 
+        Expected Behavior:
+        Editor remains stable and free of crashes.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Create several new nodes, disable the nodes via disabling/deleting components, and duplicate the nodes
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         def onEntityCreated(parameters):
             global newEntityId
             newEntityId = parameters[0]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
index 27ab6fded3..61c4cf9ac2 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/Edit_UndoNodeDelete_SliceEntity.py
@@ -9,17 +9,6 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-
-"""
-C30813586 - Editor remains stable after Undoing deletion of a node on a slice entity
-
-1. Open level with instantiated slice.
-2. Open the graph.
-3. Find the BushSpawner's Vegetation Layer Spawner node.
-4. Delete the node.
-5. Undo to restore the node.
-"""
-
 import os
 import sys
 
@@ -44,7 +33,26 @@ class TestUndoNodeDeleteSlice(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="UndoNodeDeleteSlice", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies Editor stability after undoing the deletion of nodes on a slice entity.
 
+        Expected Behavior:
+        Editor remains stable and free of crashes.
+
+        Test Steps:
+         1) Create a new level
+         2) Instantiate a slice with a Landscape Canvas setup
+         3) Find a specific node on the graph, and delete it
+         4) Restore the node with Undo
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         # Create a new empty level and instantiate LC_BushFlowerBlender.slice
         self.test_success = self.create_level(
             self.args["level"],
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
index ca3bc04f47..124baf9d2e 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientMixer_NodeConstruction.py
@@ -34,6 +34,27 @@ class TestGradientMixerNodeConstruction(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientMixerNodeConstruction", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies a Gradient Mixer vegetation setup can be constructed through Landscape Canvas.
+
+        Expected Behavior:
+        Entities contain all required components and component references after creating nodes and setting connections
+        on a Landscape Canvas graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Add all necessary nodes to the graph and set connections to form a Gradient Mixer setup
+         4) Verify all components and component references were properly set during graph construction
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
index d40b19e7db..aa98eb3dc3 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityCreatedOnNodeAdd.py
@@ -33,6 +33,25 @@ class TestGradientModifierNodeEntityCreate(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientModifierNodeEntityCreate", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities.
+
+        Expected Behavior:
+        New entities are created when dragging Gradient Modifier nodes to graph area.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the Gradient Modifier nodes to the graph area, and ensure a new entity is created
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
index dc263924d1..6a82b05039 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientModifierNodes_EntityRemovedOnNodeDelete.py
@@ -34,7 +34,26 @@ class TestGradientModifierNodeEntityDelete(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientModifierNodeEntityDelete", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas node deletion properly cleans up entities in the Editor.
 
+        Expected Behavior:
+        Entities are removed when Gradient Modifier nodes are deleted from a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the Gradient Modifier nodes to the graph area, and ensure a new entity is created
+         4) Delete the nodes, and ensure the newly created entities are removed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         def onEntityCreated(parameters):
             global createdEntityId
             createdEntityId = parameters[0]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
index 5e203e1892..f9360fe356 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_DependentComponentsAdded.py
@@ -33,6 +33,27 @@ class TestGradientNodeComponentDependency(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientNodeComponentDependency", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities with
+        proper dependent components.
+
+        Expected Behavior:
+        All expected component dependencies are met when adding a Gradient Modifier node to a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the Gradient Modifier nodes to the graph area, and ensure the proper dependent components are
+         added
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
index 6d4a2f58a7..8aaad9b81d 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityCreatedOnNodeAdd.py
@@ -32,6 +32,25 @@ class TestGradientNodeEntityCreate(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientNodeEntityCreate", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities.
+
+        Expected Behavior:
+        New entities are created when dragging Gradient nodes to graph area.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the Gradient nodes to the graph area, and ensure a new entity is created
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
index 2b49e3a911..d74b86d0bf 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GradientNodes_EntityRemovedOnNodeDelete.py
@@ -34,6 +34,26 @@ class TestGradientNodeEntityDelete(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GradientNodeEntityDelete", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas node deletion properly cleans up entities in the Editor.
+
+        Expected Behavior:
+        Entities are removed when Gradient nodes are deleted from a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the Gradient nodes to the graph area, and ensure a new entity is created
+         4) Delete the nodes, and ensure the newly created entities are removed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global createdEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
index d3ad5c1c1e..6aa539b554 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnEntityDelete.py
@@ -31,6 +31,26 @@ class TestGraphClosedOnEntityDelete(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GraphClosedOnEntityDelete", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that Landscape Canvas graphs are auto-closed when the corresponding entity is deleted.
+
+        Expected Behavior:
+        When a Landscape Canvas root entity is deleted, the corresponding graph automatically closes.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Delete the automatically created entity
+         4) Verify the open graph is closed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newRootEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
index b7b0008eb2..ebc75ab621 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_OnLevelChange.py
@@ -29,7 +29,26 @@ class TestGraphClosedOnLevelChange(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GraphClosedOnLevelChange", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that Landscape Canvas graphs are auto-closed when the currently open level changes.
 
+        Expected Behavior:
+        When a new level is loaded in the Editor, open Landscape Canvas graphs are automatically closed.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Open a different level
+         4) Verify the open graph is closed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         # Create a new empty level
         self.test_success = self.create_level(
             self.args["level"],
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
index efd1cc5a55..4b018aeb45 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphClosed_TabbedGraph.py
@@ -29,6 +29,26 @@ class TestGraphClosedTabbedGraph(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GraphClosedTabbedGraph", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that Landscape Canvas tabbed graphs can be independently closed.
+
+        Expected Behavior:
+        Closing a tabbed graph only closes the appropriate graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create several new graphs
+         3) Close one of the open graphs
+         4) Ensure the graph properly closed, and other open graphs remain open
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         # Create a new empty level
         self.test_success = self.create_level(
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
index f350d37178..f94a6c2e3a 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/GraphUpdates_UpdateComponents.py
@@ -9,21 +9,6 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 """
 
-
-"""
-C22715182 - Components are updated when nodes are added/removed/updated
-
-1. Open Level.
-2. Open the graph on LC_BushFlowerBlender.slice
-3. Find the Rotation Modifier node on the BushSpawner entity
-4. Delete the Rotation Modifier node
-5. Ensure the Vegetation Rotation Modifier component is removed from the BushSpawner entity
-6. Delete the Vegetation Layer Spawner node from the graph
-7. Ensure BushSpawner entity is deleted
-8. Change connection from second Rotation Modifier node to a different Gradient
-9. Ensure Gradient reference on component is updated
-"""
-
 import os
 import sys
 
@@ -50,6 +35,31 @@ class TestGraphUpdatesUpdateComponents(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="GraphUpdatesUpdateComponents", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that components are properly updated as nodes are added/removed/updated.
+
+        Expected Behavior:
+        Landscape Canvas node CRUD properly updates component entities.
+
+        Test Steps:
+            1. Open Level.
+            2. Open the graph on LC_BushFlowerBlender.slice
+            3. Find the Rotation Modifier node on the BushSpawner entity
+            4. Delete the Rotation Modifier node
+            5. Ensure the Vegetation Rotation Modifier component is removed from the BushSpawner entity
+            6. Delete the Vegetation Layer Spawner node from the graph
+            7. Ensure BushSpawner entity is deleted
+            8. Change connection from second Rotation Modifier node to a different Gradient
+            9. Ensure Gradient reference on component is updated
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
         # Create a new empty level and instantiate LC_BushFlowerBlender.slice
         self.test_success = self.create_level(
             self.args["level"],
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
index 176429885f..c3857e1393 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvasComponent_AddedRemoved.py
@@ -30,6 +30,26 @@ class TestLandscapeCanvasComponentAddedRemoved(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="LandscapeCanvasComponentAddedRemoved", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas component can be added to/removed from an entity.
+
+        Expected Behavior:
+        Closing a tabbed graph only closes the appropriate graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Create a new entity
+         3) Add a Landscape Canvas component to the entity
+         4) Remove the Landscape Canvas component from the entity
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         # Create a new empty level
         self.test_success = self.create_level(
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
index e0f13adaa9..f174a52610 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LandscapeCanvas_SliceCreateInstantiate.py
@@ -30,12 +30,21 @@ class TestLandscapeCanvasSliceCreateInstantiate(EditorTestHelper):
     def run_test(self):
         """
         Summary:
-        C22602016 A slice containing the LandscapeCanvas component can be created/instantiated.
+        A slice containing the LandscapeCanvas component can be created/instantiated.
 
         Expected Result:
-        Slice is created and processed successfully and free of errors/warnings.
-        Another copy of the slice is instantiated.
+        Slice is created/processed/instantiated successfully and free of errors/warnings.
 
+        Test Steps:
+         1) Create a new level
+         2) Create a new entity with a Landscape Canvas component
+         3) Create a slice of the new entity
+         4) Instantiate a new copy of the slice
+
+         Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
         :return: None
         """
 
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
index ecc529b9b4..82a2abf5ea 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerBlender_NodeConstruction.py
@@ -34,6 +34,27 @@ class TestLayerBlenderNodeConstruction(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="LayerBlenderNodeConstruction", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies a Layer Blender vegetation setup can be constructed through Landscape Canvas.
+
+        Expected Behavior:
+        Entities contain all required components and component references after creating nodes and setting connections
+        on a Landscape Canvas graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Add all necessary nodes to the graph and set connections to form a Layer Blender setup
+         4) Verify all components and component references were properly set during graph construction
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
index 00fcb5170c..df3c549fff 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/LayerExtenderNodes_ComponentEntitySync.py
@@ -34,6 +34,25 @@ class TestLayerExtenderNodeComponentEntitySync(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="LayerExtenderNodeComponentEntitySync", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that all wrapped nodes can be successfully added to/removed from parent nodes.
+
+        Expected Behavior:
+        All wrapped extender nodes can be added to/removed from appropriate parent nodes.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Add Area Blender and Layer Spawner nodes to the graph, and add/remove each extender node to/from each
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
index bd10e5f4c6..cd4915ea24 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityCreatedOnNodeAdd.py
@@ -33,6 +33,25 @@ class TestShapeNodeEntityCreate(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="ShapeNodeEntityCreate", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas nodes can be added to a graph, and correctly create entities.
+
+        Expected Behavior:
+        New entities are created when dragging shape nodes to graph area.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the shape nodes to the graph area, and ensure a new entity is created
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
 
         def onEntityCreated(parameters):
             global newEntityId
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
index f71f5ae906..fcfbe03576 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/ShapeNodes_EntityRemovedOnNodeDelete.py
@@ -34,7 +34,27 @@ class TestShapeNodeEntityDelete(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="ShapeNodeEntityDelete", args=["level"])
 
     def run_test(self):
-        
+        """
+        Summary:
+        This test verifies that the Landscape Canvas node deletion properly cleans up entities in the Editor.
+
+        Expected Behavior:
+        Entities are removed when shape nodes are deleted from a graph.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Drag each of the shape nodes to the graph area, and ensure a new entity is created
+         4) Delete the nodes, and ensure the newly created entities are removed
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
+
         def onEntityCreated(parameters):
             global createdEntityId
             createdEntityId = parameters[0]
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
index 968f39c64d..183c3f7ccb 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/EditorScripts/SlotConnections_UpdateComponentReferences.py
@@ -33,6 +33,27 @@ class TestSlotConnectionsUpdateComponents(EditorTestHelper):
         EditorTestHelper.__init__(self, log_prefix="SlotConnectionsUpdateComponents", args=["level"])
 
     def run_test(self):
+        """
+        Summary:
+        This test verifies that the Landscape Canvas slot connections properly update component references.
+
+        Expected Behavior:
+        A reference created through slot connections in Landscape Canvas is reflected in the Entity Inspector.
+
+        Test Steps:
+         1) Create a new level
+         2) Open Landscape Canvas and create a new graph
+         3) Several nodes are added to a graph, and connections are set between the nodes
+         4) Component references are verified via Entity Inspector
+
+        Note:
+        - This test file must be called from the Open 3D Engine Editor command terminal
+        - Any passed and failed tests are written to the Editor.log file.
+                Parsing the file or running a log_monitor are required to observe the test results.
+
+        :return: None
+        """
+
         # Retrieve the proper component TypeIds per component name
         componentNames = [
             'Random Noise Gradient',
diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
index efeba3b74a..855764fa6f 100755
--- a/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
+++ b/AutomatedTesting/Gem/PythonTests/largeworlds/landscape_canvas/test_GraphComponentSync.py
@@ -118,7 +118,7 @@ class TestGraphComponentSync(object):
 
     @pytest.mark.test_case_id('C15987206')
     @pytest.mark.SUITE_main
-    def test_LandscapeCanvas_GradientMixerNodeConstruction(self, request, editor, level, launcher_platform):
+    def test_LandscapeCanvas_GradientMixer_NodeConstruction(self, request, editor, level, launcher_platform):
         """
         Verifies a Gradient Mixer can be setup in Landscape Canvas and all references are property set.
         """
@@ -141,7 +141,7 @@ class TestGraphComponentSync(object):
 
     @pytest.mark.test_case_id('C21333743')
     @pytest.mark.SUITE_periodic
-    def test_LandscapeCanvas_LayerBlenderNodeConstruction(self, request, editor, level, launcher_platform):
+    def test_LandscapeCanvas_LayerBlender_NodeConstruction(self, request, editor, level, launcher_platform):
         """
         Verifies a Layer Blender can be setup in Landscape Canvas and all references are property set.
         """
diff --git a/AutomatedTesting/Levels/WaterSample/WaterSample.ly b/AutomatedTesting/Levels/WaterSample/WaterSample.ly
deleted file mode 100644
index b1899f3710..0000000000
--- a/AutomatedTesting/Levels/WaterSample/WaterSample.ly
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d49aceca5ad4e0b9f46c8127afb5c53b68aa30272950b1abd66fba310977ff0c
-size 15032
diff --git a/AutomatedTesting/Levels/WaterSample/filelist.xml b/AutomatedTesting/Levels/WaterSample/filelist.xml
deleted file mode 100644
index d14b2fdaf2..0000000000
--- a/AutomatedTesting/Levels/WaterSample/filelist.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<download name="blank2" type="Map">
- <index src="filelist.xml" dest="filelist.xml"/>
- <files>
-  <file src="level.pak" dest="level.pak" size="39815" md5="3874c8411da272b96974e24a9fff06e8"/>
- </files>
-</download>
diff --git a/AutomatedTesting/Levels/WaterSample/halfsphere.cgf b/AutomatedTesting/Levels/WaterSample/halfsphere.cgf
deleted file mode 100644
index 4426d8a232..0000000000
--- a/AutomatedTesting/Levels/WaterSample/halfsphere.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f221acd847ec8a15e1333a5163d6d0fd886b8eda46fa7b133f76ddbf1d11216
-size 41472
diff --git a/AutomatedTesting/Levels/WaterSample/halfsphere2.cgf b/AutomatedTesting/Levels/WaterSample/halfsphere2.cgf
deleted file mode 100644
index c776ff68b8..0000000000
--- a/AutomatedTesting/Levels/WaterSample/halfsphere2.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8e5dcfbe65fd2fd8ea29a38a96e703683c544fd42b9424857b1df3718c7775a
-size 41472
diff --git a/AutomatedTesting/Levels/WaterSample/level.pak b/AutomatedTesting/Levels/WaterSample/level.pak
deleted file mode 100644
index 1753ef4b93..0000000000
--- a/AutomatedTesting/Levels/WaterSample/level.pak
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0378911c27933302042550d5a031a5f9104296162edc2b21e44893f1b8cff969
-size 44124
diff --git a/AutomatedTesting/Levels/WaterSample/leveldata/Environment.xml b/AutomatedTesting/Levels/WaterSample/leveldata/Environment.xml
deleted file mode 100644
index 6a95c631bb..0000000000
--- a/AutomatedTesting/Levels/WaterSample/leveldata/Environment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Environment>
- <Fog ViewDistance="8000" ViewDistanceLowSpec="1000" LDRGlobalDensMult="1.0"/>
- <Terrain DetailLayersViewDistRatio="1.0" HeightMapAO="0"/>
- <EnvState WindVector="1,0,0" BreezeGeneration="0" BreezeStrength="1.f" BreezeMovementSpeed="8.f" BreezeVariation="1.f" BreezeLifeTime="15.f" BreezeCount="4" BreezeSpawnRadius="25.f" BreezeSpread="0.f" BreezeRadius="5.f" ConsoleMergedMeshesPool="2750" ShowTerrainSurface="1" SunShadowsMinSpec="1" SunShadowsAdditionalCascadeMinSpec="0" SunShadowsClipPlaneRange="256.0f" SunShadowsClipPlaneRangeShift="0.0f" UseLayersActivation="0" SunLinkedToTOD="1"/>
- <VolFogShadows Enable="0" EnableForClouds="0"/>
- <CloudShadows CloudShadowTexture="" CloudShadowSpeed="0,0,0" CloudShadowTiling="1.0" CloudShadowBrightness="1.0" CloudShadowInvert="0"/>
- <ParticleLighting AmbientMul="1.0" LightsMul="1.0"/>
- <SkyBox Material="EngineAssets/Materials/Sky/Sky" MaterialLowSpec="EngineAssets/Materials/Sky/Sky" Angle="0" Stretching="0.5"/>
- <Ocean Material="EngineAssets/Materials/Water/Ocean_default" CausticsDistanceAtten="100.0" CausticDepth="8.0" CausticIntensity="1.0" CausticsTilling="1.0"/>
- <OceanAnimation WindDirection="1.0" WindSpeed="4.0" WavesAmount="1.5" WavesSize="0.4" WavesSpeed="1.0"/>
- <Moon Latitude="240.0" Longitude="45.0" Size="0.5" Texture="Textures/Skys/Night/half_moon.dds"/>
- <DynTexSource Width="256" Height="256"/>
- <Total_Illumination_v2 Active="0" IntegrationMode="0" InjectionMultiplier="1.0" SkyColorMultiplier="1.0" UseTODSkyColor="0.5" PortalsDeform="0" PortalsInject="0" DiffuseAmplifier="1.0" SpecularAmplifier="0" NumberOfBounces="1" Saturation="0.8" PropagationBooster="1.5" DiffuseBias="0.05" DiffuseConeWidth="24" ConeMaxLength="12.0" UpdateLighting="0" UpdateGeometry="0" MinNodeSize="8.0" SkipNonGILights="0" LowSpecMode="0" HalfresKernel="0" UseLightProbes="0" VoxelizaionLODRatio="1.8" VoxelPoolResolution="128" SSAOAmount="0.7" ObjectsMaxViewDistance="64" SunRSMInject="0" SSDepthTrace="0"/>
-</Environment>
diff --git a/AutomatedTesting/Levels/WaterSample/leveldata/TerrainTexture.xml b/AutomatedTesting/Levels/WaterSample/leveldata/TerrainTexture.xml
deleted file mode 100644
index 21741afe52..0000000000
--- a/AutomatedTesting/Levels/WaterSample/leveldata/TerrainTexture.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<TerrainTexture TileCountX="1" TileCountY="1" TileResolution="512">
- <RGBLayer>
-  <Tiles>
-   <tile />
-  </Tiles>
- </RGBLayer>
-</TerrainTexture>
diff --git a/AutomatedTesting/Levels/WaterSample/leveldata/TimeOfDay.xml b/AutomatedTesting/Levels/WaterSample/leveldata/TimeOfDay.xml
deleted file mode 100644
index 60ad405904..0000000000
--- a/AutomatedTesting/Levels/WaterSample/leveldata/TimeOfDay.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<TimeOfDay Time="12" TimeStart="12" TimeEnd="12" TimeAnimSpeed="0">
- <Variable Name="Sun color" Color="0.94730699,0.74540401,0.57758099">
-  <Spline Keys="-0.000628322:(0.783538:0.89627:0.930341):36,0:(0.783538:0.887923:0.921582):36,0.229167:(0.783538:0.879623:0.921582):36,0.25:(0.947307:0.745404:0.577581):36,0.5:(0.947307:0.745404:0.577581):262180,0.75:(0.947307:0.745404:0.577581):36,0.770833:(0.783538:0.879623:0.921582):36,1:(0.783538:0.89627:0.930556):36,"/>
- </Variable>
- <Variable Name="Sun intensity" Value="120000">
-  <Spline Keys="0:1000:36,0.229167:1000:36,0.5:120000:36,0.770833:1000:65572,0.999306:1000:36,"/>
- </Variable>
- <Variable Name="Sun specular multiplier" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:36,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Fog color" Color="0.27049801,0.47353199,0.83077002">
-  <Spline Keys="0:(0.00651209:0.00972122:0.0137021):36,0.229167:(0.00604883:0.00972122:0.0137021):36,0.25:(0.270498:0.473532:0.83077):36,0.5:(0.270498:0.473532:0.83077):458788,0.75:(0.270498:0.473532:0.83077):36,0.770833:(0.00604883:0.00972122:0.0137021):36,1:(0.00651209:0.00972122:0.0137021):36,"/>
- </Variable>
- <Variable Name="Fog color multiplier" Value="1">
-  <Spline Keys="0:0.5:36,0.229167:0.5:36,0.25:1:36,0.5:1:36,0.75:1:36,0.770833:0.5:36,1:0.5:65572,"/>
- </Variable>
- <Variable Name="Fog height (bottom)" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
- </Variable>
- <Variable Name="Fog layer density (bottom)" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:36,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Fog color (top)" Color="0.597202,0.72305501,0.91309899">
-  <Spline Keys="0:(0.00699541:0.00972122:0.0122865):36,0.229167:(0.00699541:0.00972122:0.0122865):36,0.25:(0.597202:0.723055:0.913099):36,0.5:(0.597202:0.723055:0.913099):458788,0.75:(0.597202:0.723055:0.913099):36,0.770833:(0.00699541:0.00972122:0.0122865):36,1:(0.00699541:0.00972122:0.0122865):36,"/>
- </Variable>
- <Variable Name="Fog color (top) multiplier" Value="1">
-  <Spline Keys="-4.40702e-06:0.5:36,0.0297507:0.499195:36,0.229167:0.5:36,0.5:1:36,0.770833:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Fog height (top)" Value="100">
-  <Spline Keys="0:100:36,0.25:100:36,0.5:100:36,0.75:100:65572,1:100:36,"/>
- </Variable>
- <Variable Name="Fog layer density (top)" Value="9.9999997e-05">
-  <Spline Keys="0:0.0001:36,0.25:0.0001:36,0.5:0.0001:65572,0.75:0.0001:36,1:0.0001:36,"/>
- </Variable>
- <Variable Name="Fog color height offset" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:65572,"/>
- </Variable>
- <Variable Name="Fog color (radial)" Color="0.76815099,0.51491803,0.16826899">
-  <Spline Keys="0:(0:0:0):36,0.229167:(0.00439144:0.00367651:0.00334654):36,0.25:(0.838799:0.564712:0.184475):36,0.5:(0.768151:0.514918:0.168269):458788,0.75:(0.838799:0.564712:0.184475):36,0.770833:(0.00402472:0.00334654:0.00303527):36,1:(0:0:0):36,"/>
- </Variable>
- <Variable Name="Fog color (radial) multiplier" Value="6">
-  <Spline Keys="0:0:36,0.25:6:36,0.5:6:36,0.75:6:36,1:0:36,"/>
- </Variable>
- <Variable Name="Fog radial size" Value="0.85000002">
-  <Spline Keys="0:0:36,0.25:0.85:65572,0.5:0.85:36,0.75:0.85:36,1:0:36,"/>
- </Variable>
- <Variable Name="Fog radial lobe" Value="0.75">
-  <Spline Keys="0:0:36,0.25:0.75:36,0.5:0.75:36,0.75:0.75:65572,1:0:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Final density clamp" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Global density" Value="1.5">
-  <Spline Keys="0:1.5:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:1.5:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Ramp start" Value="25">
-  <Spline Keys="0:25:36,0.25:25:36,0.5:25:65572,0.75:25:36,1:25:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Ramp end" Value="1000">
-  <Spline Keys="0:1000:36,0.25:1000:36,0.5:1000:65572,0.75:1000:36,1:1000:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Ramp influence" Value="0.69999999">
-  <Spline Keys="0:0.7:36,0.25:0.7:36,0.5:0.7:65572,0.75:0.7:36,1:0.7:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Shadow darkening" Value="0.2">
-  <Spline Keys="0:0.2:36,0.25:0.2:36,0.5:0.2:65572,0.75:0.2:36,1:0.2:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Shadow darkening sun" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Shadow darkening ambient" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Volumetric fog: Shadow range" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog height (bottom)" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog layer density (bottom)" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog height (top)" Value="4000">
-  <Spline Keys="0:4000:0,1:4000:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog layer density (top)" Value="9.9999997e-05">
-  <Spline Keys="0:0.0001:0,1:0.0001:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Global fog density" Value="0.10000001">
-  <Spline Keys="0:0.1:0,1:0.1:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Ramp start" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Ramp end" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog albedo color (atmosphere)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Anisotropy factor (atmosphere)" Value="0.60000002">
-  <Spline Keys="0:0.6:0,1:0.6:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog albedo color (sun radial)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Anisotropy factor (sun radial)" Value="0.94999993">
-  <Spline Keys="0:0.95:0,1:0.95:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Blend factor for sun scattering" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Blend mode for sun scattering" Value="0">
-  <Spline Keys="0:0:0,1:0:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Fog albedo color (entities)" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):0,1:(1:1:1):0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Anisotropy factor (entities)" Value="0.60000002">
-  <Spline Keys="0:0.6:0,1:0.6:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Maximum range of ray-marching" Value="64">
-  <Spline Keys="0:64:0,1:64:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: In-scattering factor" Value="1">
-  <Spline Keys="0:1:0,1:1:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Extinction factor" Value="0.30000001">
-  <Spline Keys="0:0.3:0,1:0.3:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Analytical volumetric fog visibility" Value="0.5">
-  <Spline Keys="0:0.5:0,1:0.5:0,"/>
- </Variable>
- <Variable Name="Volumetric fog 2: Final density clamp" Value="1">
-  <Spline Keys="0:1:0,0.5:1:36,1:1:0,"/>
- </Variable>
- <Variable Name="Sky light: Sun intensity" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.494381:(1:1:1):65572,0.5:(1:1:1):36,0.75:(1:1:1):36,1:(1:1:1):36,"/>
- </Variable>
- <Variable Name="Sky light: Sun intensity multiplier" Value="200">
-  <Spline Keys="0:200:36,0.25:200:36,0.5:200:36,0.75:200:36,1:200:36,"/>
- </Variable>
- <Variable Name="Sky light: Mie scattering" Value="2">
-  <Spline Keys="0:40:36,0.5:2:36,1:40:36,"/>
- </Variable>
- <Variable Name="Sky light: Rayleigh scattering" Value="0.2">
-  <Spline Keys="0:0.2:36,0.229167:0.2:36,0.25:1:36,0.291667:0.2:36,0.5:0.2:36,0.729167:0.2:36,0.75:1:36,0.770833:0.2:36,1:0.2:36,"/>
- </Variable>
- <Variable Name="Sky light: Sun anisotropy factor" Value="-0.99989998">
-  <Spline Keys="0:-0.9999:36,0.25:-0.9999:36,0.5:-0.9999:65572,0.75:-0.9999:36,1:-0.9999:36,"/>
- </Variable>
- <Variable Name="Sky light: Wavelength (R)" Value="694">
-  <Spline Keys="0:694:36,0.25:694:36,0.5:694:65572,0.75:694:36,1:694:36,"/>
- </Variable>
- <Variable Name="Sky light: Wavelength (G)" Value="597">
-  <Spline Keys="0:597:36,0.25:597:36,0.5:597:36,0.75:597:36,1:597:36,"/>
- </Variable>
- <Variable Name="Sky light: Wavelength (B)" Value="488">
-  <Spline Keys="0:488:36,0.25:488:36,0.5:488:65572,0.75:488:36,1:488:36,"/>
- </Variable>
- <Variable Name="Night sky: Horizon color" Color="0.27049801,0.39157301,0.52711499">
-  <Spline Keys="0:(0.270498:0.391573:0.520996):36,0.25:(0.270498:0.391573:0.527115):36,0.5:(0.270498:0.391573:0.527115):262180,0.75:(0.270498:0.391573:0.527115):36,1:(0.270498:0.391573:0.520996):36,"/>
- </Variable>
- <Variable Name="Night sky: Horizon color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Night sky: Zenith color" Color="0.361307,0.434154,0.46778399">
-  <Spline Keys="0:(0.361307:0.434154:0.467784):36,0.25:(0.361307:0.434154:0.467784):36,0.5:(0.361307:0.434154:0.467784):262180,0.75:(0.361307:0.434154:0.467784):36,1:(0.361307:0.434154:0.467784):36,"/>
- </Variable>
- <Variable Name="Night sky: Zenith color multiplier" Value="0">
-  <Spline Keys="0:0.02:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.02:36,"/>
- </Variable>
- <Variable Name="Night sky: Zenith shift" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Night sky: Star intensity" Value="0">
-  <Spline Keys="0:3:36,0.25:0:36,0.5:0:65572,0.75:0:36,0.836647:1.03977:36,1:3:36,"/>
- </Variable>
- <Variable Name="Night sky: Moon color" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.5:(1:1:1):458788,0.75:(1:1:1):36,1:(1:1:1):36,"/>
- </Variable>
- <Variable Name="Night sky: Moon color multiplier" Value="0">
-  <Spline Keys="0:0.4:36,0.25:0:36,0.5:0:36,0.75:0:65572,1:0.4:36,"/>
- </Variable>
- <Variable Name="Night sky: Moon inner corona color" Color="0.904661,1,1">
-  <Spline Keys="0:(0.89627:1:1):36,0.25:(0.904661:1:1):36,0.5:(0.904661:1:1):393252,0.75:(0.904661:1:1):36,0.836647:(0.89627:1:1):36,1:(0.89627:1:1):36,"/>
- </Variable>
- <Variable Name="Night sky: Moon inner corona color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Night sky: Moon inner corona scale" Value="0">
-  <Spline Keys="0:2:36,0.25:0:36,0.5:0:65572,0.75:0:36,0.836647:0.693178:36,1:2:36,"/>
- </Variable>
- <Variable Name="Night sky: Moon outer corona color" Color="0.201556,0.22696599,0.254152">
-  <Spline Keys="0:(0.198069:0.226966:0.250158):36,0.25:(0.201556:0.226966:0.254152):36,0.5:(0.201556:0.226966:0.254152):36,0.75:(0.201556:0.226966:0.254152):36,1:(0.198069:0.226966:0.250158):36,"/>
- </Variable>
- <Variable Name="Night sky: Moon outer corona color multiplier" Value="0">
-  <Spline Keys="0:0.1:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Night sky: Moon outer corona scale" Value="0">
-  <Spline Keys="0:0.01:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.01:36,"/>
- </Variable>
- <Variable Name="Cloud shading: Sun light multiplier" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Cloud shading: Sun custom color" Color="0.83077002,0.76815099,0.65837502">
-  <Spline Keys="0:(0.737911:0.737911:0.737911):36,0.25:(0.83077:0.768151:0.658375):36,0.5:(0.83077:0.768151:0.658375):458788,0.75:(0.83077:0.768151:0.658375):36,1:(0.737911:0.737911:0.737911):36,"/>
- </Variable>
- <Variable Name="Cloud shading: Sun custom color multiplier" Value="1">
-  <Spline Keys="0:0.1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cloud shading: Sun custom color influence" Value="0">
-  <Spline Keys="0:0.5:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Sun shafts visibility" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0:36,"/>
- </Variable>
- <Variable Name="Sun rays visibility" Value="1.5">
-  <Spline Keys="0:1:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:1:36,"/>
- </Variable>
- <Variable Name="Sun rays attenuation" Value="1.5">
-  <Spline Keys="0:0.1:36,0.25:1.5:36,0.5:1.5:65572,0.75:1.5:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Sun rays suncolor influence" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Sun rays custom color" Color="0.66538697,0.838799,0.94730699">
-  <Spline Keys="0:(0.665387:0.838799:0.947307):36,0.25:(0.665387:0.838799:0.947307):36,0.5:(0.665387:0.838799:0.947307):458788,0.75:(0.665387:0.838799:0.947307):36,1:(0.665387:0.838799:0.947307):36,"/>
- </Variable>
- <Variable Name="Ocean fog color" Color="0.0012141099,0.0091340598,0.017642001">
-  <Spline Keys="0:(0.00121411:0.00913406:0.017642):36,0.25:(0.00121411:0.00913406:0.017642):36,0.5:(0.00121411:0.00913406:0.017642):458788,0.75:(0.00121411:0.00913406:0.017642):36,1:(0.00121411:0.00913406:0.017642):36,"/>
- </Variable>
- <Variable Name="Ocean fog color multiplier" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Ocean fog density" Value="0.5">
-  <Spline Keys="0:0.5:36,0.25:0.5:36,0.5:0.5:65572,0.75:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Skybox multiplier" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Film curve shoulder scale" Value="2">
-  <Spline Keys="0:3:36,0.229167:3:36,0.5:2:36,0.770833:3:36,1:3:36,"/>
- </Variable>
- <Variable Name="Film curve midtones scale" Value="1">
-  <Spline Keys="0:0.5:36,0.229167:0.5:36,0.5:1:36,0.770833:0.5:36,1:0.5:36,"/>
- </Variable>
- <Variable Name="Film curve toe scale" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Film curve whitepoint" Value="4">
-  <Spline Keys="0:4:36,0.25:4:36,0.5:4:65572,0.75:4:36,1:4:36,"/>
- </Variable>
- <Variable Name="Saturation" Value="1">
-  <Spline Keys="0:0.8:36,0.229167:0.8:36,0.5:1:36,0.751391:1:65572,0.770833:0.8:36,1:0.8:36,"/>
- </Variable>
- <Variable Name="Color balance" Color="1,1,1">
-  <Spline Keys="0:(1:1:1):36,0.25:(1:1:1):36,0.5:(1:1:1):36,0.75:(1:1:1):36,1:(1:1:1):36,"/>
- </Variable>
- <Variable Name="Scene key" Value="0.18000001">
-  <Spline Keys="0:0.18:36,0.25:0.18:36,0.5:0.18:65572,0.75:0.18:36,1:0.18:36,"/>
- </Variable>
- <Variable Name="Min exposure" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Max exposure" Value="2.8">
-  <Spline Keys="0:2:36,0.229167:2:36,0.5:2.8:36,0.770833:2:36,1:2:36,"/>
- </Variable>
- <Variable Name="EV Min" Value="4.5">
-  <Spline Keys="0:4.5:0,1:4.5:0,"/>
- </Variable>
- <Variable Name="EV Max" Value="17">
-  <Spline Keys="0:17:0,1:17:0,"/>
- </Variable>
- <Variable Name="EV Auto compensation" Value="1.5">
-  <Spline Keys="0:1.5:0,1:1.5:0,"/>
- </Variable>
- <Variable Name="Bloom amount" Value="0.1">
-  <Spline Keys="0:1:36,0.229167:1:36,0.5:0.1:36,0.770833:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Filters: grain" Value="0">
-  <Spline Keys="0:0.3:65572,0.229167:0.3:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0.3:36,"/>
- </Variable>
- <Variable Name="Filters: photofilter color" Color="0,0,0">
-  <Spline Keys="0:(0:0:0):36,0.25:(0:0:0):36,0.5:(0:0:0):458788,0.75:(0:0:0):36,1:(0:0:0):36,"/>
- </Variable>
- <Variable Name="Filters: photofilter density" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
- </Variable>
- <Variable Name="Dof: focus range" Value="500">
-  <Spline Keys="0:500:36,0.25:500:36,0.5:500:65572,0.75:500:36,1:500:36,"/>
- </Variable>
- <Variable Name="Dof: blur amount" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 0: Bias" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 0: Slope Bias" Value="64">
-  <Spline Keys="0:64:36,0.25:64:36,0.5:64:65572,0.75:64:36,1:64:36,"/>
- </Variable>
- <Variable Name="Cascade 1: Bias" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 1: Slope Bias" Value="8">
-  <Spline Keys="0:8:36,0.25:8:36,0.5:8:65572,0.75:8:36,1:8:36,"/>
- </Variable>
- <Variable Name="Cascade 2: Bias" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 2: Slope Bias" Value="4">
-  <Spline Keys="0:4:36,0.25:4:36,0.5:4:65572,0.75:4:36,1:4:36,"/>
- </Variable>
- <Variable Name="Cascade 3: Bias" Value="0.1">
-  <Spline Keys="0:0.1:36,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 3: Slope Bias" Value="1">
-  <Spline Keys="0:1:36,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Cascade 4: Bias" Value="0.1">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:65572,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 4: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Cascade 5: Bias" Value="0.0099999998">
-  <Spline Keys="0:0.01:0,0.25:0.01:36,0.5:0.01:65572,0.75:0.01:36,1:0.01:36,"/>
- </Variable>
- <Variable Name="Cascade 5: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Cascade 6: Bias" Value="0.1">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 6: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Cascade 7: Bias" Value="0.1">
-  <Spline Keys="0:0.1:0,0.25:0.1:36,0.5:0.1:36,0.75:0.1:36,1:0.1:36,"/>
- </Variable>
- <Variable Name="Cascade 7: Slope Bias" Value="1">
-  <Spline Keys="0:1:0,0.25:1:36,0.5:1:65572,0.75:1:36,1:1:36,"/>
- </Variable>
- <Variable Name="Shadow jittering" Value="2.5">
-  <Spline Keys="0:5:36,0.25:2.5:36,0.5:2.5:65572,0.75:2.5:36,1:5:0,"/>
- </Variable>
- <Variable Name="HDR dynamic power factor" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:65572,0.75:0:36,1:0:36,"/>
- </Variable>
- <Variable Name="Sky brightening (terrain occlusion)" Value="0">
-  <Spline Keys="0:0:36,0.25:0:36,0.5:0:36,0.75:0:36,1:0:36,"/>
- </Variable>
- <Variable Name="Sun color multiplier" Value="10">
-  <Spline Keys="0:0.1:36,0.25:10:36,0.5:10:36,0.75:10:36,1:0.1:36,"/>
- </Variable>
-</TimeOfDay>
diff --git a/AutomatedTesting/Levels/WaterSample/leveldata/VegetationMap.dat b/AutomatedTesting/Levels/WaterSample/leveldata/VegetationMap.dat
deleted file mode 100644
index dce5631cd0..0000000000
--- a/AutomatedTesting/Levels/WaterSample/leveldata/VegetationMap.dat
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e6a5435c928079b27796f6b202bbc2623e7e454244ddc099a3cadf33b7cb9e9
-size 63
diff --git a/AutomatedTesting/Levels/WaterSample/pool.cgf b/AutomatedTesting/Levels/WaterSample/pool.cgf
deleted file mode 100644
index 04bec52a62..0000000000
--- a/AutomatedTesting/Levels/WaterSample/pool.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12ca8f1942331abde4d58724aea22609c8d7951cc415afa6e5f1c550a14e67b0
-size 363624
diff --git a/AutomatedTesting/Levels/WaterSample/pool2.cgf b/AutomatedTesting/Levels/WaterSample/pool2.cgf
deleted file mode 100644
index 204306f8a8..0000000000
--- a/AutomatedTesting/Levels/WaterSample/pool2.cgf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f5b525a410730d84c0b3e97396d392e1e72f4b894742ddef3de4ede5542b0f8e
-size 86148
diff --git a/AutomatedTesting/Levels/WaterSample/tags.txt b/AutomatedTesting/Levels/WaterSample/tags.txt
deleted file mode 100644
index 0d6c1880e7..0000000000
--- a/AutomatedTesting/Levels/WaterSample/tags.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
-0,0,0,0,0,0
diff --git a/AutomatedTesting/Levels/WaterSample/terraintexture.pak b/AutomatedTesting/Levels/WaterSample/terraintexture.pak
deleted file mode 100644
index fe3604a050..0000000000
--- a/AutomatedTesting/Levels/WaterSample/terraintexture.pak
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8739c76e681f900923b900c9df0ef75cf421d39cabb54650c4b9ad19b6a76d85
-size 22
diff --git a/AutomatedTesting/Levels/WaterSample/woodland_canyon_river.mtl b/AutomatedTesting/Levels/WaterSample/woodland_canyon_river.mtl
deleted file mode 100644
index 4548bca421..0000000000
--- a/AutomatedTesting/Levels/WaterSample/woodland_canyon_river.mtl
+++ /dev/null
@@ -1,7 +0,0 @@
-<Material MtlFlags="2623488" Shader="Watervolume" GenMask="80000013" StringGenMask="" SurfaceType="mat_water" Diffuse="1,1,1,1" Specular="0.27583286,0.27583286,0.27583286,1" Opacity="1" Shininess="255" vertModifType="0" LayerAct="1">
- <Textures>
-  <Texture Map="Specular" File="engineassets/textures/water_gloss.dds" Filter="7"/>
-  <Texture Map="Environment" File="nearest_cubemap" TexType="7"/>
- </Textures>
- <PublicParams NormalsScale="0.5" GlossMapTilling="1" SoftIntersectionFactor="1" Tilling="0.1" DetailNormalsScale="0.5" GlossMapBias="0" EnvCubeReflMul="16" VertexWaveScale="0.125" DetailTilling="2.5" EnvCubeScale="16" GlossMapScale="1.5" RealtimeReflMul="1" RainTilling="1" WaterFlowSpeed="0.5"/>
-</Material>
diff --git a/AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings b/AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings
index 013c774e9e..a4e1a9a3c5 100644
--- a/AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings
+++ b/AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:0,pc:0,provo:0"
\ No newline at end of file
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:0,pc:0,provo:0"
\ No newline at end of file
diff --git a/AutomatedTesting/preview.png b/AutomatedTesting/preview.png
index 2191a0ebc2..3d4fe78063 100644
--- a/AutomatedTesting/preview.png
+++ b/AutomatedTesting/preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a18fae4040a22d2bb359a8ca642b97bb8f6468eeb52e2826b3b029bd8f1350b6
-size 5466
+oid sha256:40949893ed7009eeaa90b7ce6057cb6be9dfaf7b162e3c26ba9dadf985939d7d
+size 2038
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63177e9d60..a7e42613cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,10 @@ foreach(external_directory ${LY_EXTERNAL_SUBDIRS})
 endforeach()
 
 # The following steps have to be done after all targets are registered:
+# Defer generation of the StaticModules.inl file which is needed to create the AZ::Module derived class in monolithic
+# builds until after all the targets are known
+ly_delayed_generate_static_modules_inl()
+
 # 1. generate a settings registry .setreg file for all ly_add_project_dependencies() and ly_add_target_dependencies() calls
 #    to provide applications with the filenames of gem modules to load
 #    This must be done before ly_delayed_target_link_libraries() as that inserts BUILD_DEPENDENCIES as MANUALLY_ADDED_DEPENDENCIES
diff --git a/Code/CryEngine/CryCommon/ISystem.h b/Code/CryEngine/CryCommon/ISystem.h
index f863804f3d..653776f55b 100644
--- a/Code/CryEngine/CryCommon/ISystem.h
+++ b/Code/CryEngine/CryCommon/ISystem.h
@@ -125,7 +125,7 @@ enum ESystemConfigPlatform
 {
     CONFIG_INVALID_PLATFORM = 0,
     CONFIG_PC = 1,
-    CONFIG_OSX_GL = 2,
+    CONFIG_MAC = 2,
     CONFIG_OSX_METAL = 3,
     CONFIG_ANDROID = 4,
     CONFIG_IOS = 5,
diff --git a/Code/CryEngine/CryCommon/LyShine/IDraw2d.h b/Code/CryEngine/CryCommon/LyShine/IDraw2d.h
index 16fdfceca3..76a71c9e24 100644
--- a/Code/CryEngine/CryCommon/LyShine/IDraw2d.h
+++ b/Code/CryEngine/CryCommon/LyShine/IDraw2d.h
@@ -11,7 +11,6 @@
 */
 #pragma once
 
-#include <IRenderer.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>
@@ -84,7 +83,7 @@ public: // types
     //! If this is not passed then the defaults below are used
     struct TextOptions
     {
-        IFFont*         font;                   //!< default is "default"
+        AZStd::string   fontName;               //!< default is "default"
         unsigned int    effectIndex;            //!< default is 0
         AZ::Vector3     color;                  //!< default is (1,1,1)
         HAlign          horizontalAlignment;    //!< default is HAlign::Left
diff --git a/Code/CryEngine/CrySystem/System.h b/Code/CryEngine/CrySystem/System.h
index b91b1ba059..a258030f70 100644
--- a/Code/CryEngine/CrySystem/System.h
+++ b/Code/CryEngine/CrySystem/System.h
@@ -729,7 +729,7 @@ protected: // -------------------------------------------------------------
     CCmdLine*                                      m_pCmdLine;
 
     string  m_currentLanguageAudio;
-    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_es3.cfg or system_android_opengl.cfg or system_windows_pc.cfg
+    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_android.cfg or system_windows_pc.cfg
 
     std::vector< std::pair<CTimeValue, float> > m_updateTimes;
 
diff --git a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
index b5d3de8164..5c1a120df6 100644
--- a/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
+++ b/Code/Framework/AzAndroid/java/com/amazon/lumberyard/LumberyardActivity.java
@@ -244,7 +244,7 @@ public class LumberyardActivity extends NativeActivity
         boolean useMainObb = GetBooleanResource("use_main_obb");
         boolean usePatchObb = GetBooleanResource("use_patch_obb");
 
-        if (IsBootstrapInAPK() && (useMainObb || usePatchObb))
+        if (AreAssetsInAPK() && (useMainObb || usePatchObb))
         {
             Log.d(TAG, "Using OBB expansion files for game assets");
 
@@ -421,12 +421,12 @@ public class LumberyardActivity extends NativeActivity
     }
 
     ////////////////////////////////////////////////////////////////
-    private boolean IsBootstrapInAPK()
+    private boolean AreAssetsInAPK()
     {
         try
         {
-            InputStream bootstrap = getAssets().open("bootstrap.cfg", AssetManager.ACCESS_UNKNOWN);
-            bootstrap.close();
+            InputStream engine = getAssets().open("engine.json", AssetManager.ACCESS_UNKNOWN);
+            engine.close();
             return true;
         }
         catch (IOException exception)
diff --git a/Code/Framework/AzCore/AzCore/Android/Utils.cpp b/Code/Framework/AzCore/AzCore/Android/Utils.cpp
index efbbf50d1d..d6435c67be 100644
--- a/Code/Framework/AzCore/AzCore/Android/Utils.cpp
+++ b/Code/Framework/AzCore/AzCore/Android/Utils.cpp
@@ -148,7 +148,7 @@ namespace AZ
                     }
                 }
 
-                AZ_Assert(false, "Failed to locate the bootstrap.cfg path");
+                AZ_Assert(false, "Failed to locate the engine.json path");
                 return nullptr;
             }
 
diff --git a/Code/Framework/AzCore/AzCore/Android/Utils.h b/Code/Framework/AzCore/AzCore/Android/Utils.h
index 222fac80ad..0862d53aa4 100644
--- a/Code/Framework/AzCore/AzCore/Android/Utils.h
+++ b/Code/Framework/AzCore/AzCore/Android/Utils.h
@@ -73,8 +73,8 @@ namespace AZ
             //! \return The pointer position of the relative asset path
             AZ::IO::FixedMaxPath StripApkPrefix(const char* filePath);
 
-            //! Searches application storage and the APK for bootstrap.cfg.  Will return nullptr
-            //! if bootstrap.cfg is not found.
+            //! Searches application storage and the APK for engine.json.  Will return nullptr
+            //! if engine.json is not found.
             const char* FindAssetsDirectory();
 
             //! Calls into Java to show the splash screen on the main UI (Java) thread
diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
index 8a170f5d89..f03b1aac76 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp
@@ -462,8 +462,6 @@ namespace AZ
         // for the application root.
         CalculateAppRoot();
 
-        // Merge the bootstrap.cfg file into the Settings Registry as soon as the OSAllocator has been created.
-        SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(*m_settingsRegistry);
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(*m_settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(*m_settingsRegistry, m_commandLine, executeRegDumpCommands);
         SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*m_settingsRegistry);
diff --git a/Code/Framework/AzCore/AzCore/Component/TransformBus.h b/Code/Framework/AzCore/AzCore/Component/TransformBus.h
index be18593d54..b180e97332 100644
--- a/Code/Framework/AzCore/AzCore/Component/TransformBus.h
+++ b/Code/Framework/AzCore/AzCore/Component/TransformBus.h
@@ -172,78 +172,10 @@ namespace AZ
 
         //! Rotation modifiers
         //! @{
-        //! @deprecated Use SetLocalRotation()
-        //! Sets the entity's rotation in the world.
-        //! The origin of the axes is the entity's position in world space.
-        //! @param eulerAnglesRadians A three-dimensional vector, containing Euler angles in radians, to rotate the entity by.
-        virtual void SetRotation([[maybe_unused]] const AZ::Vector3& eulerAnglesRadians) {}
-
-        //! @deprecated Use SetLocalRotation()
-        //! Sets the entity's rotation around the world's X axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The X coordinate Euler angle in radians to use for the entity's rotation.
-        virtual void SetRotationX([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use SetLocalRotation()
-        //! Sets the entity's rotation around the world's Y axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The Y coordinate Euler angle in radians to use for the entity's rotation.
-        virtual void SetRotationY([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use SetLocalRotation()
-        //! Sets the entity's rotation around the world's Z axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The Z coordinate Euler angle in radians to use for the entity's rotation.
-        virtual void SetRotationZ([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use SetLocalRotationQuaternion()
         //! Sets the entity's rotation in the world in quaternion notation.
         //! The origin of the axes is the entity's position in world space.
         //! @param quaternion A quaternion that represents the rotation to use for the entity.
-        virtual void SetRotationQuaternion([[maybe_unused]] const AZ::Quaternion& quaternion) {}
-
-        //! @deprecated Use RotateAroundLocalX()
-        //! Rotates the entity around the world's X axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The Euler angle in radians by which to rotate the entity around the X axis.
-        virtual void RotateByX([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use RotateAroundLocalY()
-        //! Rotates the entity around the world's Y axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The Euler angle in radians by which to rotate the entity around the Y axis.
-        virtual void RotateByY([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use RotateAroundLocalZ()
-        //! Rotates the entity around the world's Z axis.
-        //! The origin of the axis is the entity's position in world space.
-        //! @param eulerAngleRadians The Euler angle in radians by which to rotate the entity around the Z axis.
-        virtual void RotateByZ([[maybe_unused]] float eulerAngleRadian) {}
-
-        //! @deprecated Use GetLocalRotation()
-        //! Gets the entity's rotation in the world in Euler angles rotation in radians.
-        //! @return A three-dimensional vector, containing Euler angles in radians, that represents the entity's rotation.
-        virtual AZ::Vector3 GetRotationEulerRadians() { return AZ::Vector3(FLT_MAX); }
-
-        //! @deprecated Use GetLocalRotationQuaternion()
-        //! Gets the entity's rotation in the world in quaternion format.
-        //! @return A quaternion that represents the entity's rotation in world space.
-        virtual AZ::Quaternion GetRotationQuaternion() { return AZ::Quaternion::CreateZero(); }
-
-        //! @deprecated Use GetLocalRotation()
-        //! Gets the entity's rotation around the world's X axis.
-        //! @return The Euler angle in radians by which the the entity is rotated around the X axis in world space.
-        virtual float GetRotationX() { return FLT_MAX; }
-
-        //! @deprecated Use GetLocalRotation()
-        //! Gets the entity's rotation around the world's Y axis.
-        //! @return The Euler angle in radians by which the the entity is rotated around the Y axis in world space.
-        virtual float GetRotationY() { return FLT_MAX; }
-
-        //! @deprecated Use GetLocalRotation()
-        //! Gets the entity's rotation around the world's Z axis.
-        //! @return The Euler angle in radians by which the the entity is rotated around the Z axis in world space.
-        virtual float GetRotationZ() { return FLT_MAX; }
+        virtual void SetWorldRotationQuaternion([[maybe_unused]] const AZ::Quaternion& quaternion) {}
 
         //! Get angles in radian for each principle axis around which the world transform is
         //! rotated in the order of z-axis and y-axis and then x-axis.
diff --git a/Code/Framework/AzCore/AzCore/Math/Random.h b/Code/Framework/AzCore/AzCore/Math/Random.h
index 8b28f6aaad..8b2763df50 100644
--- a/Code/Framework/AzCore/AzCore/Math/Random.h
+++ b/Code/Framework/AzCore/AzCore/Math/Random.h
@@ -126,17 +126,16 @@ namespace AZ
             m_offsets.fill(1); // Halton sequences start at index 1.
             m_increments.fill(1); // By default increment by 1 between each number.
         }
-
-        //! Returns a Halton sequence in an array of N length
-        template<uint32_t N>
-        AZStd::array<AZStd::array<float, Dimensions>, N> GetHaltonSequence()
+        
+        //! Fills a provided container from begin to end with a Halton sequence.
+        //! Entries are expected to be, or implicitly converted to, AZStd::array<float, Dimensions>.
+        template<typename Iterator>
+        void FillHaltonSequence(Iterator begin, Iterator end)
         {
-            AZStd::array<AZStd::array<float, Dimensions>, N> result;
-
             AZStd::array<uint32_t, Dimensions> indices = m_offsets;
 
             // Generator that returns the Halton number for all bases for a single entry.
-            auto f = [&] ()
+            auto f = [&]()
             {
                 AZStd::array<float, Dimensions> item;
                 for (auto d = 0; d < Dimensions; ++d)
@@ -147,12 +146,20 @@ namespace AZ
                 return item;
             };
 
-            AZStd::generate(result.begin(), result.end(), f);
+            AZStd::generate(begin, end, f);
+        }
+        
+        //! Returns a Halton sequence in an array of N length.
+        template<uint32_t N>
+        AZStd::array<AZStd::array<float, Dimensions>, N> GetHaltonSequence()
+        {
+            AZStd::array<AZStd::array<float, Dimensions>, N> result;
+            FillHaltonSequence(result.begin(), result.end());
             return result;
         }
 
         //! Sets the offsets per dimension to start generating a sequence from.
-        //! By default, there is no offset (offset of 0 corresponds to starting at index 1)
+        //! By default, there is no offset (offset of 0 corresponds to starting at index 1).
         void SetOffsets(AZStd::array<uint32_t, Dimensions> offsets)
         {
             m_offsets = offsets;
diff --git a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
index 63aad1ecf4..e31c3b0a1e 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
@@ -19,7 +19,7 @@ namespace AZ
 {
     inline namespace PlatformDefaults
     {
-        static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformES3, PlatformIOS, PlatformOSX, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
+        static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformAndroid, PlatformIOS, PlatformMac, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
 
         const char* PlatformIdToPalFolder(AZ::PlatformId platform)
         {
@@ -31,11 +31,11 @@ namespace AZ
             {
             case AZ::PC:
                 return "PC";
-            case AZ::ES3:
+            case AZ::ANDROID_ID:
                 return "Android";
             case AZ::IOS:
                 return "iOS";
-            case AZ::OSX:
+            case AZ::MAC_ID:
                 return "Mac";
             case AZ::PROVO:
                 return "Provo";
@@ -66,11 +66,11 @@ namespace AZ
             }
             else if (osPlatform == PlatformCodeNameMac)
             {
-                return PlatformOSX;
+                return PlatformMac;
             }
             else if (osPlatform == PlatformCodeNameAndroid)
             {
-                return PlatformES3;
+                return PlatformAndroid;
             }
             else if (osPlatform == PlatformCodeNameiOS)
             {
@@ -207,13 +207,13 @@ namespace AZ
                 platformCodes.emplace_back(PlatformCodeNameWindows);
                 platformCodes.emplace_back(PlatformCodeNameLinux);
                 break;
-            case PlatformId::ES3:
+            case PlatformId::ANDROID_ID:
                 platformCodes.emplace_back(PlatformCodeNameAndroid);
                 break;
             case PlatformId::IOS:
                 platformCodes.emplace_back(PlatformCodeNameiOS);
                 break;
-            case PlatformId::OSX:
+            case PlatformId::MAC_ID:
                 platformCodes.emplace_back(PlatformCodeNameMac);
                 break;
             case PlatformId::PROVO:
diff --git a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
index 2d67c860cd..ba8c55f5f5 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
@@ -27,9 +27,9 @@ namespace AZ
     inline namespace PlatformDefaults
     {
         constexpr char PlatformPC[] = "pc";
-        constexpr char PlatformES3[] = "es3";
+        constexpr char PlatformAndroid[] = "android";
         constexpr char PlatformIOS[] = "ios";
-        constexpr char PlatformOSX[] = "osx_gl";
+        constexpr char PlatformMac[] = "mac";
         constexpr char PlatformProvo[] = "provo";
         constexpr char PlatformSalem[] = "salem";
         constexpr char PlatformJasper[] = "jasper";
@@ -54,9 +54,9 @@ namespace AZ
         AZ_ENUM_WITH_UNDERLYING_TYPE(PlatformId, int,
             (Invalid, -1),
             PC,
-            ES3,
+            ANDROID_ID,
             IOS,
-            OSX,
+            MAC_ID,
             PROVO,
             SALEM,
             JASPER,
@@ -73,9 +73,9 @@ namespace AZ
         {
             Platform_NONE = 0x00,
             Platform_PC = 1 << PlatformId::PC,
-            Platform_ES3 = 1 << PlatformId::ES3,
+            Platform_ANDROID = 1 << PlatformId::ANDROID_ID,
             Platform_IOS = 1 << PlatformId::IOS,
-            Platform_OSX = 1 << PlatformId::OSX,
+            Platform_MAC = 1 << PlatformId::MAC_ID,
             Platform_PROVO = 1 << PlatformId::PROVO,
             Platform_SALEM = 1 << PlatformId::SALEM,
             Platform_JASPER = 1 << PlatformId::JASPER,
@@ -87,7 +87,7 @@ namespace AZ
             // A special platform that will always correspond to all non-server platforms, even if new ones are added
             Platform_ALL_CLIENT = 1ULL << 31,
 
-            AllNamedPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
+            AllNamedPlatforms = Platform_PC | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
         };
 
         AZ_DEFINE_ENUM_BITWISE_OPERATORS(PlatformFlags);
diff --git a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
index 0258869a0c..d56140be28 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp
@@ -28,8 +28,8 @@ namespace AZ
             return "Android64";
         case PlatformID::PLATFORM_APPLE_IOS:
             return "iOS";
-        case PlatformID::PLATFORM_APPLE_OSX:
-            return "OSX";
+        case PlatformID::PLATFORM_APPLE_MAC:
+            return "Mac";
 #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
         case PlatformID::PLATFORM_##PUBLICNAME:\
diff --git a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
index ce1a11d8ce..e8e7cef6dd 100644
--- a/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
+++ b/Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h
@@ -23,7 +23,7 @@ namespace AZ
         PLATFORM_WINDOWS_64,
         PLATFORM_LINUX_64,
         PLATFORM_APPLE_IOS,
-        PLATFORM_APPLE_OSX,
+        PLATFORM_APPLE_MAC,
         PLATFORM_ANDROID_64,    // ARMv8 / 64-bit
         #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
diff --git a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
index 015554538f..11d4db2e07 100644
--- a/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
+++ b/Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp
@@ -937,7 +937,7 @@ void ScriptSystemComponent::Reflect(ReflectContext* reflection)
             ->Enum<static_cast<int>(PlatformID::PLATFORM_LINUX_64)>("Linux")
             ->Enum<static_cast<int>(PlatformID::PLATFORM_ANDROID_64)>("Android64")
             ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_IOS)>("iOS")
-            ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_OSX)>("OSX")
+            ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_MAC)>("Mac")
 #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
             ->Enum<static_cast<int>(PlatformID::PLATFORM_##PUBLICNAME)>(#CodeName)
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
index 82bf1db484..5870c66633 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp
@@ -494,13 +494,6 @@ namespace AZ::SettingsRegistryMergeUtils
         return configFileParsed;
     }
 
-    void MergeSettingsToRegistry_Bootstrap(SettingsRegistryInterface& registry)
-    {
-        ConfigParserSettings parserSettings;
-        parserSettings.m_registryRootPointerPath = BootstrapSettingsRootKey;
-        MergeSettingsToRegistry_ConfigFile(registry, "bootstrap.cfg", parserSettings);
-    }
-
     void MergeSettingsToRegistry_AddRuntimeFilePaths(SettingsRegistryInterface& registry)
     {
         using FixedValueString = AZ::SettingsRegistryInterface::FixedValueString;
diff --git a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
index 576066c29f..b482530d24 100644
--- a/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
+++ b/Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.h
@@ -172,9 +172,6 @@ namespace AZ::SettingsRegistryMergeUtils
     bool MergeSettingsToRegistry_ConfigFile(SettingsRegistryInterface& registry, AZStd::string_view filePath,
         const ConfigParserSettings& configParserSettings);
 
-    //! Loads bootstrap.cfg into the Settings Registry. This file does not support specializations.
-    void MergeSettingsToRegistry_Bootstrap(SettingsRegistryInterface& registry);
-
     //! Extracts file path information from the environment and bootstrap to calculate the various file paths and adds those
     //! to the Settings Registry under the FilePathsRootKey.
     void MergeSettingsToRegistry_AddRuntimeFilePaths(SettingsRegistryInterface& registry);
diff --git a/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
index d361e79f05..42dcd3e2f7 100644
--- a/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
+++ b/Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
@@ -13,5 +13,5 @@
 
 namespace AZ
 {
-    static const PlatformID g_currentPlatform = PlatformID::PLATFORM_APPLE_OSX;
+    static const PlatformID g_currentPlatform = PlatformID::PLATFORM_APPLE_MAC;
 }
diff --git a/Code/Framework/AzCore/Tests/Math/RandomTests.cpp b/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
index ace7d99704..7fe3acff54 100644
--- a/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
+++ b/Code/Framework/AzCore/Tests/Math/RandomTests.cpp
@@ -24,7 +24,7 @@ namespace UnitTest
         EXPECT_FLOAT_EQ(5981.0f / 15625.0f, GetHaltonNumber(4321, 5));
     }
 
-    TEST(MATH_Random, HaltonSequence)
+    TEST(MATH_Random, HaltonSequenceStandard)
     {
         HaltonSequence<3> sequence({ 2, 3, 5 });
         auto regularSequence = sequence.GetHaltonSequence<5>();
@@ -48,7 +48,11 @@ namespace UnitTest
         EXPECT_FLOAT_EQ(5.0f / 8.0f, regularSequence[4][0]);
         EXPECT_FLOAT_EQ(7.0f / 9.0f, regularSequence[4][1]);
         EXPECT_FLOAT_EQ(1.0f / 25.0f, regularSequence[4][2]);
-
+    }
+    
+    TEST(MATH_Random, HaltonSequenceOffsets)
+    {
+        HaltonSequence<3> sequence({ 2, 3, 5 });
         sequence.SetOffsets({ 1, 2, 3 });
         auto offsetSequence = sequence.GetHaltonSequence<2>();
 
@@ -59,10 +63,15 @@ namespace UnitTest
         EXPECT_FLOAT_EQ(3.0f / 4.0f, offsetSequence[1][0]);
         EXPECT_FLOAT_EQ(4.0f / 9.0f, offsetSequence[1][1]);
         EXPECT_FLOAT_EQ(1.0f / 25.0f, offsetSequence[1][2]);
-        
+    }
+    
+    TEST(MATH_Random, HaltonSequenceIncrements)
+    {
+        HaltonSequence<3> sequence({ 2, 3, 5 });
+        sequence.SetOffsets({ 1, 2, 3 });
         sequence.SetIncrements({ 1, 2, 3 });
         auto incrementedSequence = sequence.GetHaltonSequence<2>();
-        
+
         EXPECT_FLOAT_EQ(1.0f / 4.0f, incrementedSequence[0][0]);
         EXPECT_FLOAT_EQ(1.0f / 9.0f, incrementedSequence[0][1]);
         EXPECT_FLOAT_EQ(4.0f / 5.0f, incrementedSequence[0][2]);
@@ -71,4 +80,35 @@ namespace UnitTest
         EXPECT_FLOAT_EQ(7.0f / 9.0f, incrementedSequence[1][1]);
         EXPECT_FLOAT_EQ(11.0f / 25.0f, incrementedSequence[1][2]);
     }
+    
+    TEST(MATH_Random, FillHaltonSequence)
+    {
+        HaltonSequence<3> sequence({ 2, 3, 5 });
+        auto regularSequence = sequence.GetHaltonSequence<5>();
+
+        struct Point
+        {
+            Point() = default;
+            Point(AZStd::array<float, 3> arr)
+                :x(arr[0])
+                ,y(arr[1])
+                ,z(arr[2])
+            {}
+
+            float x = 0.0f;
+            float y = 0.0f;
+            float z = 0.0f;
+        };
+
+        AZStd::array<Point, 5> ownedContainer;
+        sequence.FillHaltonSequence(ownedContainer.begin(), ownedContainer.end());
+
+        for (size_t i = 0; i < regularSequence.size(); ++i)
+        {
+            EXPECT_FLOAT_EQ(regularSequence[i][0], ownedContainer[i].x);
+            EXPECT_FLOAT_EQ(regularSequence[i][1], ownedContainer[i].y);
+            EXPECT_FLOAT_EQ(regularSequence[i][2], ownedContainer[i].z);
+        }
+    }
+
 }
diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
index e1e9bd237d..7eabd6e5e0 100644
--- a/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization/Json/TransformSerializerTests.cpp
@@ -112,7 +112,7 @@ namespace JsonSerializationTests
         AZ::Transform testTransform = AZ::Transform::CreateIdentity();
         AZ::Transform expectedTransform = 
             AZ::Transform::CreateFromQuaternion(AZ::Quaternion(0.25f, 0.5f, 0.75f, 1.0f));
-        expectedTransform.SetScale(AZ::Vector3(5.5f));
+        expectedTransform.SetUniformScale(5.5f);
 
         rapidjson::Document json;
         json.Parse(R"({ "Rotation": [ 0.25, 0.5, 0.75, 1.0 ], "Scale": 5.5 })");
@@ -128,7 +128,7 @@ namespace JsonSerializationTests
     {
         AZ::Transform testTransform = AZ::Transform::CreateIdentity();
         AZ::Transform expectedTransform = AZ::Transform::CreateTranslation(AZ::Vector3(2.25f, 3.5f, 4.75f));
-        expectedTransform.SetScale(AZ::Vector3(5.5f));
+        expectedTransform.SetUniformScale(5.5f);
 
         rapidjson::Document json;
         json.Parse(R"({ "Translation": [ 2.25, 3.5, 4.75 ], "Scale": 5.5 })");
diff --git a/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp b/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
index 36b9757ce3..751d9ded6c 100644
--- a/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
+++ b/Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp
@@ -372,15 +372,15 @@ mac_remote_filesystem=0
 -- We need to know this before we establish VFS because different platform assets
 -- are stored in different root folders in the cache.  These correspond to the names
 -- In the asset processor config file.  This value also controls what config file is read
--- when you read system_xxxx_xxxx.cfg (for example, system_windows_pc.cfg or system_android_es3.cfg)
+-- when you read system_xxxx_xxxx.cfg (for example, system_windows_pc.cfg or system_android_android.cfg)
 -- by default, pc assets (in the 'pc' folder) are used, with RC being fed 'pc' as the platform
 -- by default on console we use the default assets=pc for better iteration times
 -- we should turn on console specific assets only when in release and/or testing assets and/or loading performance
 -- that way most people will not need to have 3 different caches taking up disk space
 assets = pc
-android_assets = es3
+android_assets = android
 ios_assets = ios
-mac_assets = osx_gl
+mac_assets = mac
 
 -- Add the IP address of your console to the white list that will connect to the asset processor here
 -- You can list addresses or CIDR's. CIDR's are helpful if you are using DHCP. A CIDR looks like an ip address with
@@ -438,9 +438,9 @@ mac_wait_for_connect=0
             ConfigFileParams::SettingsKeyValuePair{"/ios_remote_filesystem", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/mac_remote_filesystem", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/assets", AZStd::string_view{"pc"}},
-            ConfigFileParams::SettingsKeyValuePair{"/android_assets", AZStd::string_view{"es3"}},
+            ConfigFileParams::SettingsKeyValuePair{"/android_assets", AZStd::string_view{"android"}},
             ConfigFileParams::SettingsKeyValuePair{"/ios_assets", AZStd::string_view{"ios"}},
-            ConfigFileParams::SettingsKeyValuePair{"/mac_assets", AZStd::string_view{"osx_gl"}},
+            ConfigFileParams::SettingsKeyValuePair{"/mac_assets", AZStd::string_view{"mac"}},
             ConfigFileParams::SettingsKeyValuePair{"/connect_to_remote", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/windows_connect_to_remote", AZ::s64{1}},
             ConfigFileParams::SettingsKeyValuePair{"/android_connect_to_remote", AZ::s64{0}},
@@ -478,20 +478,20 @@ test_asset_processor_tag = test_value
 [Platform pc]
 tags=tools,renderer,dx12,vulkan
 
-[Platform es3]
+[Platform android]
 tags=android,mobile,renderer,vulkan ; With Comments at the end
 
 [Platform ios]
 tags=mobile,renderer,metal
 
-[Platform osx_gl]
+[Platform mac]
 tags=tools,renderer,metal)"
         , AZStd::fixed_vector<ConfigFileParams::SettingsKeyValuePair, 20>{
             ConfigFileParams::SettingsKeyValuePair{"/test_asset_processor_tag", AZStd::string_view{"test_value"}},
             ConfigFileParams::SettingsKeyValuePair{"/Platform pc/tags", AZStd::string_view{"tools,renderer,dx12,vulkan"}},
-            ConfigFileParams::SettingsKeyValuePair{"/Platform es3/tags", AZStd::string_view{"android,mobile,renderer,vulkan"}},
+            ConfigFileParams::SettingsKeyValuePair{"/Platform android/tags", AZStd::string_view{"android,mobile,renderer,vulkan"}},
             ConfigFileParams::SettingsKeyValuePair{"/Platform ios/tags", AZStd::string_view{"mobile,renderer,metal"}},
-            ConfigFileParams::SettingsKeyValuePair{"/Platform osx_gl/tags", AZStd::string_view{"tools,renderer,metal"}},
+            ConfigFileParams::SettingsKeyValuePair{"/Platform mac/tags", AZStd::string_view{"tools,renderer,metal"}},
         }}
         )
     );
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index e02892de4e..c65ba373f8 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -679,8 +679,6 @@ namespace AzFramework
         {
             auto fileIoBase = m_archiveFileIO.get();
             // Set up the default file aliases based on the settings registry
-            fileIoBase->SetAlias("@assets@", "");
-            fileIoBase->SetAlias("@root@", GetEngineRoot());
             fileIoBase->SetAlias("@engroot@", GetEngineRoot());
             fileIoBase->SetAlias("@projectroot@", GetEngineRoot());
             fileIoBase->SetAlias("@exefolder@", GetExecutableFolder());
@@ -694,8 +692,8 @@ namespace AzFramework
                 pathAliases.clear();
                 if (m_settingsRegistry->Get(pathAliases.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_CacheRootFolder))
                 {
-                    fileIoBase->SetAlias("@projectplatformcache@", pathAliases.c_str());
                     fileIoBase->SetAlias("@assets@", pathAliases.c_str());
+                    fileIoBase->SetAlias("@projectplatformcache@", pathAliases.c_str());
                     fileIoBase->SetAlias("@root@", pathAliases.c_str()); // Deprecated Use @projectplatformcache@
                 }
                 pathAliases.clear();
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index b0285616df..4a80db2b24 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -2008,13 +2008,12 @@ namespace AZ::IO
         // if no bind root is specified, compute one:
         strBindRoot = !bindRoot.empty() ? bindRoot : szFullPath->ParentPath().Native();
 
-        // Check if archive file disk exist on disk or inside of pak.
-        bool bFileExists = IsFileExist(szFullPath->Native());
-
-        if (!bFileExists && (nFactoryFlags & ZipDir::CacheFactory::FLAGS_READ_ONLY))
+        // Check if archive file disk exist on disk.
+        const bool pakOnDisk = FileIOBase::GetDirectInstance()->Exists(szFullPath->c_str());
+        if (!pakOnDisk && (nFactoryFlags & ZipDir::CacheFactory::FLAGS_READ_ONLY))
         {
             // Archive file not found.
-            AZ_TracePrintf("Archive", "Cannot open Archive file %s\n", szFullPath->c_str());
+            AZ_TracePrintf("Archive", "Archive file %s does not exist\n", szFullPath->c_str());
             return nullptr;
         }
 
@@ -2492,8 +2491,6 @@ namespace AZ::IO
 
     void Archive::FindCompressionInfo(bool& found, AZ::IO::CompressionInfo& info, const AZStd::string_view filename)
     {
-        constexpr uint32_t s_compressionTag = static_cast<uint32_t>('Z') << 24 | static_cast<uint32_t>('C') << 16 | static_cast<uint32_t>('R') << 8 | static_cast<uint32_t>('Y');
-
         if (!found)
         {
             auto correctedFilename = AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(filename);
@@ -2519,7 +2516,6 @@ namespace AZ::IO
                 found = true;
 
                 info.m_archiveFilename.InitFromRelativePath(archive->GetFilePath());
-                info.m_compressionTag.m_code = s_compressionTag;
                 info.m_offset = pFileData->GetFileDataOffset();
                 info.m_compressedSize = entry->desc.lSizeCompressed;
                 info.m_uncompressedSize = entry->desc.lSizeUncompressed;
@@ -2539,9 +2535,8 @@ namespace AZ::IO
                     break;
                 }
 
-                info.m_decompressor = [&s_compressionTag]([[maybe_unused]] const AZ::IO::CompressionInfo& info, const void* compressed, size_t compressedSize, void* uncompressed, size_t uncompressedBufferSize)->bool
+                info.m_decompressor = []([[maybe_unused]] const AZ::IO::CompressionInfo& info, const void* compressed, size_t compressedSize, void* uncompressed, size_t uncompressedBufferSize)->bool
                 {
-                    AZ_Assert(info.m_compressionTag.m_code == s_compressionTag, "Provided compression info isn't supported by this decompressor.");
                     size_t nSizeUncompressed = uncompressedBufferSize;
                     return ZipDir::ZipRawUncompress(uncompressed, &nSizeUncompressed, compressed, compressedSize) == 0;
                 };
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
index 678f4e40bf..1794ae90e7 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
@@ -50,6 +50,7 @@ namespace AZ::IO
         , tWrite{ writeTime }
     {
     }
+
     ArchiveFileIterator::ArchiveFileIterator(FindData* findData, AZStd::string_view filename, const FileDesc& fileDesc)
         : m_findData{ findData }
         , m_filename{ filename }
@@ -108,13 +109,10 @@ namespace AZ::IO
             AZ::StringFunc::Path::GetFullPath(directory.c_str(), searchDirectory);
             AZ::StringFunc::Path::GetFullFileName(directory.c_str(), pattern);
         }
-
         AZ::IO::FileIOBase::GetDirectInstance()->FindFiles(searchDirectory.c_str(), pattern.c_str(), [&](const char* filePath) -> bool
         {
             AZ::IO::FileDesc fileDesc;
-
-            AZStd::string fullFilePath;
-            AZ::StringFunc::Path::GetFullFileName(filePath, fullFilePath);
+            AZStd::string filePathEntry{filePath};
 
             if (AZ::IO::FileIOBase::GetDirectInstance()->IsDirectory(filePath))
             {
@@ -135,9 +133,8 @@ namespace AZ::IO
                 fileDesc.tAccess = fileDesc.tWrite;
                 fileDesc.tCreate = fileDesc.tWrite;
             }
-            [[maybe_unused]] auto result = m_mapFiles.emplace(AZStd::move(fullFilePath), fileDesc);
-            AZ_Assert(result.second, "Failed to insert FindData entry for %s", fullFilePath.c_str());
-
+            [[maybe_unused]] auto result = m_mapFiles.emplace(AZStd::move(filePathEntry), fileDesc);
+            AZ_Assert(result.second, "Failed to insert FindData entry for filePath %s", filePath);
             return true;
         });
     }
@@ -273,7 +270,9 @@ namespace AZ::IO
         }
 
         auto pakFileIter = m_mapFiles.begin();
-        fileIterator.m_filename = pakFileIter->first;
+        AZStd::string fullFilePath;
+        AZ::StringFunc::Path::GetFullFileName(pakFileIter->first.c_str(), fullFilePath);
+        fileIterator.m_filename = AZStd::move(fullFilePath);
         fileIterator.m_fileDesc = pakFileIter->second;
         fileIterator.m_lastFetchValid = true;
 
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
index 020feffc47..7280c4af5c 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.cpp
@@ -308,6 +308,56 @@ namespace AzFramework
             }
         }
 
+        //---------------------------------------------------------------------
+        GenerateRelativeSourcePathRequest::GenerateRelativeSourcePathRequest(const AZ::OSString& sourcePath)
+        {
+            AZ_Assert(!sourcePath.empty(), "GenerateRelativeSourcePathRequest: asset path is empty");
+            m_sourcePath = sourcePath;
+        }
+
+        unsigned int GenerateRelativeSourcePathRequest::GetMessageType() const
+        {
+            return MessageType;
+        }
+
+        void GenerateRelativeSourcePathRequest::Reflect(AZ::ReflectContext* context)
+        {
+            auto serialize = azrtti_cast<AZ::SerializeContext*>(context);
+            if (serialize)
+            {
+                serialize->Class<GenerateRelativeSourcePathRequest, BaseAssetProcessorMessage>()
+                    ->Version(1)
+                    ->Field("SourcePath", &GenerateRelativeSourcePathRequest::m_sourcePath);
+            }
+        }
+
+        //---------------------------------------------------------------------
+        GenerateRelativeSourcePathResponse::GenerateRelativeSourcePathResponse(
+            bool resolved, const AZ::OSString& relativeSourcePath, const AZ::OSString& rootFolder)
+        {
+            m_relativeSourcePath = relativeSourcePath;
+            m_resolved = resolved;
+            m_rootFolder = rootFolder;
+        }
+
+        unsigned int GenerateRelativeSourcePathResponse::GetMessageType() const
+        {
+            return GenerateRelativeSourcePathRequest::MessageType;
+        }
+
+        void GenerateRelativeSourcePathResponse::Reflect(AZ::ReflectContext* context)
+        {
+            auto serialize = azrtti_cast<AZ::SerializeContext*>(context);
+            if (serialize)
+            {
+                serialize->Class<GenerateRelativeSourcePathResponse, BaseAssetProcessorMessage>()
+                    ->Version(1)
+                    ->Field("RelativeSourcePath", &GenerateRelativeSourcePathResponse::m_relativeSourcePath)
+                    ->Field("RootFolder", &GenerateRelativeSourcePathResponse::m_rootFolder)
+                    ->Field("Resolved", &GenerateRelativeSourcePathResponse::m_resolved);
+            }
+        }
+
         //---------------------------------------------------------------------
         GetFullSourcePathFromRelativeProductPathRequest::GetFullSourcePathFromRelativeProductPathRequest(const AZ::OSString& relativeProductPath)
         {
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
index 9661e61828..c15f75e3e7 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h
@@ -288,6 +288,45 @@ namespace AzFramework
             bool m_resolved;
         };
 
+        //////////////////////////////////////////////////////////////////////////
+        class GenerateRelativeSourcePathRequest : public BaseAssetProcessorMessage
+        {
+        public:
+            AZ_CLASS_ALLOCATOR(GenerateRelativeSourcePathRequest, AZ::OSAllocator, 0);
+            AZ_RTTI(GenerateRelativeSourcePathRequest, "{B3865033-F5A3-4749-8147-7B1AB04D5F6D}",
+                BaseAssetProcessorMessage);
+            static void Reflect(AZ::ReflectContext* context);
+
+            // For people that are debugging the network messages and just see MessageType as a value,
+            // the CRC value below is 739777771 (0x2C181CEB)
+            static constexpr unsigned int MessageType =
+                AZ_CRC_CE("AssetSystem::GenerateRelativeSourcePathRequest");
+
+            GenerateRelativeSourcePathRequest() = default;
+            GenerateRelativeSourcePathRequest(const AZ::OSString& sourcePath);
+            unsigned int GetMessageType() const override;
+
+            AZ::OSString m_sourcePath;
+        };
+
+        class GenerateRelativeSourcePathResponse : public BaseAssetProcessorMessage
+        {
+        public:
+            AZ_CLASS_ALLOCATOR(GenerateRelativeSourcePathResponse, AZ::OSAllocator, 0);
+            AZ_RTTI(GenerateRelativeSourcePathResponse, "{938D33DB-C8F6-4FA4-BC81-2F139A9BE1D7}",
+                BaseAssetProcessorMessage);
+            static void Reflect(AZ::ReflectContext* context);
+
+            GenerateRelativeSourcePathResponse() = default;
+            GenerateRelativeSourcePathResponse(
+                bool resolved, const AZ::OSString& relativeSourcePath, const AZ::OSString& rootFolder);
+            unsigned int GetMessageType() const override;
+
+            AZ::OSString m_relativeSourcePath;
+            AZ::OSString m_rootFolder; ///< This is the folder it was found in (the watched/scanned folder, such as gems /assets/ folder)
+            bool m_resolved;
+        };
+
         //////////////////////////////////////////////////////////////////////////
         class GetFullSourcePathFromRelativeProductPathRequest
             : public BaseAssetProcessorMessage
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
index 83c4907468..6b19084c2a 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp
@@ -202,6 +202,7 @@ namespace AzFramework
             // Requests
             GetUnresolvedDependencyCountsRequest::Reflect(context);
             GetRelativeProductPathFromFullSourceOrProductPathRequest::Reflect(context);
+            GenerateRelativeSourcePathRequest::Reflect(context);
             GetFullSourcePathFromRelativeProductPathRequest::Reflect(context);
             SourceAssetInfoRequest::Reflect(context);
             AssetInfoRequest::Reflect(context);
@@ -234,6 +235,7 @@ namespace AzFramework
             // Responses
             GetUnresolvedDependencyCountsResponse::Reflect(context);
             GetRelativeProductPathFromFullSourceOrProductPathResponse::Reflect(context);
+            GenerateRelativeSourcePathResponse::Reflect(context);
             GetFullSourcePathFromRelativeProductPathResponse::Reflect(context);
             SourceAssetInfoResponse::Reflect(context);
             AssetInfoResponse::Reflect(context);
diff --git a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
index 682e886061..ee8b79bf06 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.h
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
 #include <AzCore/Component/Component.h>
 #include <AzCore/RTTI/RTTI.h>
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/Serialization/SerializeContext.h>
 
 namespace AzFramework
 {
@@ -64,15 +64,13 @@ namespace AzFramework
         the EditContext. TController can friend itself to the editor component to make this work if required.
     */
         template<typename TController, typename TConfiguration = AZ::ComponentConfig>
-        class ComponentAdapter
-            : public AZ::Component
+        class ComponentAdapter : public AZ::Component
         {
         public:
-
             AZ_RTTI((ComponentAdapter, "{644A9187-4FDB-42C1-9D59-DD75304B551A}", TController, TConfiguration), AZ::Component);
 
             ComponentAdapter() = default;
-            ComponentAdapter(const TConfiguration& configuration);
+            explicit ComponentAdapter(const TConfiguration& configuration);
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
@@ -85,7 +83,6 @@ namespace AzFramework
             void Deactivate() override;
 
         protected:
-
             static void Reflect(AZ::ReflectContext* context);
 
             // AZ::Component overrides ...
diff --git a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
index a1b0826193..5c36ff0bf7 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapter.inl
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include <AzFramework/Components/ComponentAdapterHelpers.h>
 
@@ -32,10 +32,12 @@ namespace AzFramework
 
             if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
+                // clang-format off
                 serializeContext->Class<ComponentAdapter, Component>()
                     ->Version(1)
                     ->Field("Controller", &ComponentAdapter::m_controller)
                     ;
+                // clang-format on
             }
         }
 
@@ -66,9 +68,6 @@ namespace AzFramework
             GetDependentServicesHelper<TController>(services, typename AZ::HasComponentDependentServices<TController>::type());
         }
 
-        //////////////////////////////////////////////////////////////////////////
-        // AZ::Component interface implementation
-
         template<typename TController, typename TConfiguration>
         void ComponentAdapter<TController, TConfiguration>::Init()
         {
@@ -78,7 +77,7 @@ namespace AzFramework
         template<typename TController, typename TConfiguration>
         void ComponentAdapter<TController, TConfiguration>::Activate()
         {
-            m_controller.Activate(GetEntityId());
+            ComponentActivateHelper<TController>::Activate(m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
         }
 
         template<typename TController, typename TConfiguration>
diff --git a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
index 158ee95f39..f0ef262a71 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/ComponentAdapterHelpers.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include <AzCore/Component/Component.h>
+#include <AzCore/Component/EntityBus.h>
 
 namespace AzFramework
 {
@@ -27,18 +28,43 @@ namespace AzFramework
         template<typename T, typename = void>
         struct ComponentInitHelper
         {
-            static void Init(T& common)
+            static void Init([[maybe_unused]] T& controller)
             {
-                AZ_UNUSED(common);
             }
         };
 
         template<typename T>
         struct ComponentInitHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Init())>>
         {
-            static void Init(T& common)
+            static void Init(T& controller)
             {
-                common.Init();
+                controller.Init();
+            }
+        };
+
+        template<typename T, typename = void>
+        struct ComponentActivateHelper
+        {
+            static void Activate([[maybe_unused]] T& controller, [[maybe_unused]] const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+            }
+        };
+
+        template<typename T>
+        struct ComponentActivateHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Activate(AZ::EntityId()))>>
+        {
+            static void Activate(T& controller, const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+                controller.Activate(entityComponentIdPair.GetEntityId());
+            }
+        };
+
+        template<typename T>
+        struct ComponentActivateHelper<T, AZStd::void_t<decltype(AZStd::declval<T>().Activate(AZ::EntityComponentIdPair()))>>
+        {
+            static void Activate(T& controller, const AZ::EntityComponentIdPair& entityComponentIdPair)
+            {
+                controller.Activate(entityComponentIdPair);
             }
         };
 
diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
index 3dafc7c717..49adab2252 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
@@ -327,99 +327,13 @@ namespace AzFramework
         return localZ;
     }
 
-    void TransformComponent::SetRotation(const AZ::Vector3& eulerAnglesRadian)
+    void TransformComponent::SetWorldRotationQuaternion(const AZ::Quaternion& quaternion)
     {
-        AZ_Warning("TransformComponent", false, "SetRotation is deprecated, please use SetLocalRotation");
-
-        AZ::Transform newWorldTransform = m_worldTM;
-        newWorldTransform.SetRotation(AZ::ConvertEulerRadiansToQuaternion(eulerAnglesRadian));
-        SetWorldTM(newWorldTransform);
-    }
-
-    void TransformComponent::SetRotationQuaternion(const AZ::Quaternion& quaternion)
-    {
-        AZ_Warning("TransformComponent", false, "SetRotationQuaternion is deprecated, please use SetLocalRotationQuaternion");
-
         AZ::Transform newWorldTransform = m_worldTM;
         newWorldTransform.SetRotation(quaternion);
         SetWorldTM(newWorldTransform);
     }
 
-    void TransformComponent::SetRotationX(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "SetRotationX is deprecated, please use SetLocalRotation");
-
-        AZ::Transform newWorldTransform = m_worldTM;
-        newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationX(eulerAngleRadian));
-        SetWorldTM(newWorldTransform);
-    }
-
-    void TransformComponent::SetRotationY(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "SetRotationY is deprecated, please use SetLocalRotation");
-
-        AZ::Transform newWorldTransform = m_worldTM;
-        newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationY(eulerAngleRadian));
-        SetWorldTM(newWorldTransform);
-    }
-
-    void TransformComponent::SetRotationZ(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "SetRotationZ is deprecated, please use SetLocalRotation");
-
-        AZ::Transform newWorldTransform = m_worldTM;
-        newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationZ(eulerAngleRadian));
-        SetWorldTM(newWorldTransform);
-    }
-
-    void TransformComponent::RotateByX(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "RotateByX is deprecated, please use RotateAroundLocalX");
-        RotateAroundLocalX(eulerAngleRadian);
-    }
-
-    void TransformComponent::RotateByY(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "RotateByY is deprecated, please use RotateAroundLocalY");
-        RotateAroundLocalY(eulerAngleRadian);
-    }
-
-    void TransformComponent::RotateByZ(float eulerAngleRadian)
-    {
-        AZ_Warning("TransformComponent", false, "RotateByZ is deprecated, please use RotateAroundLocalZ");
-        RotateAroundLocalZ(eulerAngleRadian);
-    }
-
-    AZ::Vector3 TransformComponent::GetRotationEulerRadians()
-    {
-        AZ_Warning("TransformComponent", false, "GetRotationEulerRadians is deprecated, please use GetWorldRotation");
-        return m_worldTM.GetRotation().GetEulerRadians();
-    }
-
-    AZ::Quaternion TransformComponent::GetRotationQuaternion()
-    {
-        AZ_Warning("TransformComponent", false, "GetRotationQuaternion is deprecated, please use GetWorldRotationQuaternion");
-        return m_worldTM.GetRotation();
-    }
-
-    float TransformComponent::GetRotationX()
-    {
-        AZ_Warning("TransformComponent", false, "GetRotationX is deprecated, please use GetWorldRotation");
-        return GetRotationEulerRadians().GetX();
-    }
-
-    float TransformComponent::GetRotationY()
-    {
-        AZ_Warning("TransformComponent", false, "GetRotationY is deprecated, please use GetWorldRotation");
-        return GetRotationEulerRadians().GetY();
-    }
-
-    float TransformComponent::GetRotationZ()
-    {
-        AZ_Warning("TransformComponent", false, "GetRotationZ is deprecated, please use GetWorldRotation");
-        return GetRotationEulerRadians().GetZ();
-    }
-
     AZ::Vector3 TransformComponent::GetWorldRotation()
     {
         return m_worldTM.GetRotation().GetEulerRadians();
@@ -830,45 +744,7 @@ namespace AzFramework
                 ->Event("GetLocalX", &AZ::TransformBus::Events::GetLocalX)
                 ->Event("GetLocalY", &AZ::TransformBus::Events::GetLocalY)
                 ->Event("GetLocalZ", &AZ::TransformBus::Events::GetLocalZ)
-                ->Event("RotateByX", &AZ::TransformBus::Events::RotateByX)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("RotateByY", &AZ::TransformBus::Events::RotateByY)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("RotateByZ", &AZ::TransformBus::Events::RotateByZ)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("SetEulerRotation", &AZ::TransformBus::Events::SetRotation)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("SetRotationQuaternion", &AZ::TransformBus::Events::SetRotationQuaternion)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("SetRotationX", &AZ::TransformBus::Events::SetRotationX)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("SetRotationY", &AZ::TransformBus::Events::SetRotationY)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("SetRotationZ", &AZ::TransformBus::Events::SetRotationZ)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetEulerRotation", &AZ::TransformBus::Events::GetRotationEulerRadians)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetRotationQuaternion", &AZ::TransformBus::Events::GetRotationQuaternion)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetRotationX", &AZ::TransformBus::Events::GetRotationX)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                   ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetRotationY", &AZ::TransformBus::Events::GetRotationY)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
-                ->Event("GetRotationZ", &AZ::TransformBus::Events::GetRotationZ)
-                    ->Attribute(AZ::Script::Attributes::Deprecated, true)
-                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All)
+                ->Event("SetWorldRotationQuaternion", &AZ::TransformBus::Events::SetWorldRotationQuaternion)
                 ->Event("GetWorldRotation", &AZ::TransformBus::Events::GetWorldRotation)
                 ->Event("GetWorldRotationQuaternion", &AZ::TransformBus::Events::GetWorldRotationQuaternion)
                 ->Event("SetLocalRotation", &AZ::TransformBus::Events::SetLocalRotation)
diff --git a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
index e3a647d39f..9009c6bff9 100644
--- a/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
+++ b/Code/Framework/AzFramework/AzFramework/Components/TransformComponent.h
@@ -112,22 +112,7 @@ namespace AzFramework
         float GetLocalZ() override;
 
         // Rotation modifiers
-        void SetRotation(const AZ::Vector3& eulerAnglesRadian) override;
-        void SetRotationQuaternion(const AZ::Quaternion& quaternion) override;
-        void SetRotationX(float eulerAngleRadian) override;
-        void SetRotationY(float eulerAngleRadian) override;
-        void SetRotationZ(float eulerAngleRadian) override;
-
-        void RotateByX(float eulerAngleRadian) override;
-        void RotateByY(float eulerAngleRadian) override;
-        void RotateByZ(float eulerAngleRadian) override;
-
-        AZ::Vector3 GetRotationEulerRadians() override;
-        AZ::Quaternion GetRotationQuaternion() override;
-
-        float GetRotationX() override;
-        float GetRotationY() override;
-        float GetRotationZ() override;
+        void SetWorldRotationQuaternion(const AZ::Quaternion& quaternion) override;
 
         AZ::Vector3 GetWorldRotation() override;
         AZ::Quaternion GetWorldRotationQuaternion() override;
diff --git a/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h b/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
index b64b61e22c..04a0572bb9 100644
--- a/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Font/FontInterface.h
@@ -15,6 +15,7 @@
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Color.h>
+#include <AzCore/Math/Matrix3x4.h>
 #include <AzCore/std/string/string_view.h>
 #include <AzFramework/Viewport/ViewportId.h>
 
@@ -42,11 +43,15 @@ namespace AzFramework
     {
         ViewportId m_drawViewportId = InvalidViewportId; //!< Viewport to draw into
         AZ::Vector3 m_position; //!< world space position for 3d draws, screen space x,y,depth for 2d.
-        AZ::Color   m_color = AZ::Colors::White; //!< Color to draw the text
+        AZ::Color m_color = AZ::Colors::White; //!< Color to draw the text
+        unsigned int m_effectIndex = 0; //!< effect index to apply
         AZ::Vector2 m_scale = AZ::Vector2(1.0f); //!< font scale
-        float       m_lineSpacing; //!< Spacing between new lines, as a percentage of m_scale.
+        float m_textSizeFactor = 12.0f; //!< font size in pixels
+        float m_lineSpacing = 1.0f; //!< Spacing between new lines, as a percentage of m_scale.
         TextHorizontalAlignment m_hAlign = TextHorizontalAlignment::Left; //!< Horizontal text alignment
         TextVerticalAlignment m_vAlign = TextVerticalAlignment::Top; //!< Vertical text alignment
+        bool m_useTransform = false; //!< Use specified transform
+        AZ::Matrix3x4 m_transform = AZ::Matrix3x4::Identity(); //!< Transform to apply to text quads
         bool m_monospace = false; //!< disable character proportional spacing
         bool m_depthTest = false; //!< Test character against the depth buffer
         bool m_virtual800x600ScreenSize = true; //!< Text placement and size are scaled relative to a virtual 800x600 resolution
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
index 239d93cf32..97c841e8f8 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
@@ -102,7 +102,7 @@ namespace Physics
 
         /// Is the ragdoll currently simulated?
         /// @result True in case the ragdoll is simulated, false if not.
-        virtual bool IsSimulated() = 0;
+        virtual bool IsSimulated() const = 0;
 
         /// Writes the state for all of the bodies in the ragdoll to the provided output.
         /// The caller owns the output state and can safely manipulate it without affecting the physics simulation.
diff --git a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
index bdbfe6197f..2742b90f4c 100644
--- a/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/ProjectManager/ProjectManager.cpp
@@ -46,7 +46,6 @@ namespace AzFramework::ProjectManager
             // Store the Command line to the Setting Registry
             AZ::SettingsRegistryImpl settingsRegistry;
             AZ::SettingsRegistryMergeUtils::StoreCommandLineToRegistry(settingsRegistry, commandLine);
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
             // Retrieve Command Line from Settings Registry, it may have been updated by the call to FindEngineRoot()
             // in MergeSettingstoRegistry_ConfigFile
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
index 5e507b3498..79cea647e4 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/Spawnable.h
@@ -19,10 +19,13 @@
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzFramework/Spawnable/SpawnableMetaData.h>
 
-namespace AzFramework
+namespace AZ
 {
     class ReflectContext;
+}
 
+namespace AzFramework
+{
     class Spawnable final
         : public AZ::Data::AssetData
     {
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
index a528797f63..97169ebeb3 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
@@ -14,6 +14,10 @@
 
 namespace AzFramework
 {
+    //
+    // SpawnableEntityContainerView
+    //
+
     SpawnableEntityContainerView::SpawnableEntityContainerView(AZ::Entity** begin, size_t length)
         : m_begin(begin)
         , m_end(begin + length)
@@ -52,6 +56,9 @@ namespace AzFramework
     }
 
 
+    //
+    // SpawnableConstEntityContainerView
+    //
 
     SpawnableConstEntityContainerView::SpawnableConstEntityContainerView(AZ::Entity** begin, size_t length)
         : m_begin(begin)
@@ -91,6 +98,136 @@ namespace AzFramework
     }
 
 
+    //
+    // SpawnableIndexEntityPair
+    //
+
+    SpawnableIndexEntityPair::SpawnableIndexEntityPair(AZ::Entity** entityIterator, size_t* indexIterator)
+        : m_entity(entityIterator)
+        , m_index(indexIterator)
+    {
+    }
+
+    AZ::Entity* SpawnableIndexEntityPair::GetEntity()
+    {
+        return *m_entity;
+    }
+
+    const AZ::Entity* SpawnableIndexEntityPair::GetEntity() const
+    {
+        return *m_entity;
+    }
+
+    size_t SpawnableIndexEntityPair::GetIndex() const
+    {
+        return *m_index;
+    }
+
+    //
+    // SpawnableIndexEntityIterator
+    //
+
+    SpawnableIndexEntityIterator::SpawnableIndexEntityIterator(AZ::Entity** entityIterator, size_t* indexIterator)
+        : m_value(entityIterator, indexIterator)
+    {
+    }
+
+    SpawnableIndexEntityIterator& SpawnableIndexEntityIterator::operator++()
+    {
+        ++m_value.m_entity;
+        ++m_value.m_index;
+        return *this;
+    }
+
+    SpawnableIndexEntityIterator SpawnableIndexEntityIterator::operator++(int)
+    {
+        SpawnableIndexEntityIterator result = *this;
+        ++m_value.m_entity;
+        ++m_value.m_index;
+        return result;
+    }
+
+    SpawnableIndexEntityIterator& SpawnableIndexEntityIterator::operator--()
+    {
+        --m_value.m_entity;
+        --m_value.m_index;
+        return *this;
+    }
+
+    SpawnableIndexEntityIterator SpawnableIndexEntityIterator::operator--(int)
+    {
+        SpawnableIndexEntityIterator result = *this;
+        --m_value.m_entity;
+        --m_value.m_index;
+        return result;
+    }
+
+    bool SpawnableIndexEntityIterator::operator==(const SpawnableIndexEntityIterator& rhs)
+    {
+        return m_value.m_entity == rhs.m_value.m_entity && m_value.m_index == rhs.m_value.m_index;
+    }
+
+    bool SpawnableIndexEntityIterator::operator!=(const SpawnableIndexEntityIterator& rhs)
+    {
+        return m_value.m_entity != rhs.m_value.m_entity || m_value.m_index != rhs.m_value.m_index;
+    }
+
+    SpawnableIndexEntityPair& SpawnableIndexEntityIterator::operator*()
+    {
+        return m_value;
+    }
+
+    const SpawnableIndexEntityPair& SpawnableIndexEntityIterator::operator*() const
+    {
+        return m_value;
+    }
+
+    SpawnableIndexEntityPair* SpawnableIndexEntityIterator::operator->()
+    {
+        return &m_value;
+    }
+
+    const SpawnableIndexEntityPair* SpawnableIndexEntityIterator::operator->() const
+    {
+        return &m_value;
+    }
+
+
+    //
+    // SpawnableConstIndexEntityContainerView
+    //
+
+    SpawnableConstIndexEntityContainerView::SpawnableConstIndexEntityContainerView(
+        AZ::Entity** beginEntity, size_t* beginIndices, size_t length)
+        : m_begin(beginEntity, beginIndices)
+        , m_end(beginEntity + length, beginIndices + length)
+    {
+    }
+
+    const SpawnableIndexEntityIterator& SpawnableConstIndexEntityContainerView::begin()
+    {
+        return m_begin;
+    }
+
+    const SpawnableIndexEntityIterator& SpawnableConstIndexEntityContainerView::end()
+    {
+        return m_end;
+    }
+
+    const SpawnableIndexEntityIterator& SpawnableConstIndexEntityContainerView::cbegin()
+    {
+        return m_begin;
+    }
+
+    const SpawnableIndexEntityIterator& SpawnableConstIndexEntityContainerView::cend()
+    {
+        return m_end;
+    }
+
+
+    //
+    // EntitySpawnTicket
+    //
 
     EntitySpawnTicket::EntitySpawnTicket(EntitySpawnTicket&& rhs)
         : m_payload(rhs.m_payload)
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
index ac66288ff2..69bca8e111 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
@@ -58,6 +58,72 @@ namespace AzFramework
         AZ::Entity** m_end;
     };
 
+    class SpawnableIndexEntityPair
+    {
+    public:
+        friend class SpawnableIndexEntityIterator;
+
+        AZ::Entity* GetEntity();
+        const AZ::Entity* GetEntity() const;
+        size_t GetIndex() const;
+
+    private:
+        SpawnableIndexEntityPair() = default;
+        SpawnableIndexEntityPair(const SpawnableIndexEntityPair&) = default;
+        SpawnableIndexEntityPair(SpawnableIndexEntityPair&&) = default;
+        SpawnableIndexEntityPair(AZ::Entity** entityIterator, size_t* indexIterator);
+
+        SpawnableIndexEntityPair& operator=(const SpawnableIndexEntityPair&) = default;
+        SpawnableIndexEntityPair& operator=(SpawnableIndexEntityPair&&) = default;
+
+        AZ::Entity** m_entity { nullptr };
+        size_t* m_index { nullptr };
+    };
+
+    class SpawnableIndexEntityIterator
+    {
+    public:
+        // Limited to bidirectional iterator as there's no use case for extending it further, but can be extended if a use case is found.
+        using iterator_category = AZStd::bidirectional_iterator_tag;
+        using value_type = SpawnableIndexEntityPair;
+        using difference_type = size_t;
+        using pointer = SpawnableIndexEntityPair*;
+        using reference = SpawnableIndexEntityPair&;
+
+        SpawnableIndexEntityIterator(AZ::Entity** entityIterator, size_t* indexIterator);
+
+        SpawnableIndexEntityIterator& operator++();
+        SpawnableIndexEntityIterator operator++(int);
+        SpawnableIndexEntityIterator& operator--();
+        SpawnableIndexEntityIterator operator--(int);
+
+        bool operator==(const SpawnableIndexEntityIterator& rhs);
+        bool operator!=(const SpawnableIndexEntityIterator& rhs);
+
+        SpawnableIndexEntityPair& operator*();
+        const SpawnableIndexEntityPair& operator*() const;
+        SpawnableIndexEntityPair* operator->();
+        const SpawnableIndexEntityPair* operator->() const;
+
+    private:
+        SpawnableIndexEntityPair m_value;
+    };
+
+    class SpawnableConstIndexEntityContainerView
+    {
+    public:
+        SpawnableConstIndexEntityContainerView(AZ::Entity** beginEntity, size_t* beginIndices, size_t length);
+
+        const SpawnableIndexEntityIterator& begin();
+        const SpawnableIndexEntityIterator& end();
+        const SpawnableIndexEntityIterator& cbegin();
+        const SpawnableIndexEntityIterator& cend();
+
+    private:
+        SpawnableIndexEntityIterator m_begin;
+        SpawnableIndexEntityIterator m_end;
+    };
+
     //! Requests to the SpawnableEntitiesInterface require a ticket with a valid spawnable that be used as a template. A ticket can
     //! be reused for multiple calls on the same spawnable and is safe to use by multiple threads at the same time. Entities created
     //! from the spawnable may be tracked by the ticket and so using the same ticket is needed to despawn the exact entities created
@@ -88,6 +154,7 @@ namespace AzFramework
     using EntityDespawnCallback = AZStd::function<void(EntitySpawnTicket&)>;
     using ReloadSpawnableCallback = AZStd::function<void(EntitySpawnTicket&, SpawnableConstEntityContainerView)>;
     using ListEntitiesCallback = AZStd::function<void(EntitySpawnTicket&, SpawnableConstEntityContainerView)>;
+    using ListIndicesEntitiesCallback = AZStd::function<void(EntitySpawnTicket&, SpawnableConstIndexEntityContainerView)>;
     using ClaimEntitiesCallback = AZStd::function<void(EntitySpawnTicket&, SpawnableEntityContainerView)>;
     using BarrierCallback = AZStd::function<void(EntitySpawnTicket&)>;
 
@@ -140,6 +207,15 @@ namespace AzFramework
         //! @param ticket Only the entities associated with this ticket will be listed.
         //! @param listCallback Required callback that will be called to list the entities on.
         virtual void ListEntities(EntitySpawnTicket& ticket, ListEntitiesCallback listCallback) = 0;
+        //! List all entities that are spawned using this ticket with their spawnable index.
+        //!     Spawnables contain a flat list of entities, which are used as templates to spawn entities from. For every spawned entity
+        //!     the index of the entity in the spawnable that was used as a template is stored. This version of ListEntities will return
+        //!     both the entities and this index. The index can be used with SpawnEntities to create the same entities again. Note that
+        //!     the same index may appear multiple times as there are no restriction on how many instance of a specific entity can be
+        //!     created.
+        //! @param ticket Only the entities associated with this ticket will be listed.
+        //! @param listCallback Required callback that will be called to list the entities and indices on.
+        virtual void ListIndicesAndEntities(EntitySpawnTicket& ticket, ListIndicesEntitiesCallback listCallback) = 0;
         //! Claim all entities that are spawned using this ticket. Ownership of the entities is transferred from the ticket to the
         //!     caller through the callback. After this call the ticket will have no entities associated with it. The caller of
         //!     this function will need to manage the entities after this call.
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
index 8045766686..7e20f7b265 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
@@ -25,6 +25,8 @@ namespace AzFramework
     void SpawnableEntitiesManager::SpawnAllEntities(EntitySpawnTicket& ticket, EntityPreInsertionCallback preInsertionCallback,
         EntitySpawnCallback completionCallback)
     {
+        AZ_Assert(ticket.IsValid(), "Ticket provided to SpawnAllEntities hasn't been initialized.");
+
         SpawnAllEntitiesCommand queueEntry;
         queueEntry.m_ticket = &ticket;
         queueEntry.m_completionCallback = AZStd::move(completionCallback);
@@ -40,6 +42,8 @@ namespace AzFramework
         EntitySpawnTicket& ticket, AZStd::vector<size_t> entityIndices,
         EntityPreInsertionCallback preInsertionCallback, EntitySpawnCallback completionCallback)
     {
+        AZ_Assert(ticket.IsValid(), "Ticket provided to SpawnEntities hasn't been initialized.");
+
         SpawnEntitiesCommand queueEntry;
         queueEntry.m_ticket = &ticket;
         queueEntry.m_entityIndices = AZStd::move(entityIndices);
@@ -54,6 +58,8 @@ namespace AzFramework
 
     void SpawnableEntitiesManager::DespawnAllEntities(EntitySpawnTicket& ticket, EntityDespawnCallback completionCallback)
     {
+        AZ_Assert(ticket.IsValid(), "Ticket provided to DespawnAllEntities hasn't been initialized.");
+
         DespawnAllEntitiesCommand queueEntry;
         queueEntry.m_ticket = &ticket;
         queueEntry.m_completionCallback = AZStd::move(completionCallback);
@@ -67,6 +73,8 @@ namespace AzFramework
     void SpawnableEntitiesManager::ReloadSpawnable(EntitySpawnTicket& ticket, AZ::Data::Asset<Spawnable> spawnable,
         ReloadSpawnableCallback completionCallback)
     {
+        AZ_Assert(ticket.IsValid(), "Ticket provided to ReloadSpawnable hasn't been initialized.");
+
         ReloadSpawnableCommand queueEntry;
         queueEntry.m_ticket = &ticket;
         queueEntry.m_spawnable = AZStd::move(spawnable);
@@ -81,6 +89,7 @@ namespace AzFramework
     void SpawnableEntitiesManager::ListEntities(EntitySpawnTicket& ticket, ListEntitiesCallback listCallback)
     {
         AZ_Assert(listCallback, "ListEntities called on spawnable entities without a valid callback to use.");
+        AZ_Assert(ticket.IsValid(), "Ticket provided to ListEntities hasn't been initialized.");
 
         ListEntitiesCommand queueEntry;
         queueEntry.m_ticket = &ticket;
@@ -92,9 +101,25 @@ namespace AzFramework
         }
     }
 
+    void SpawnableEntitiesManager::ListIndicesAndEntities(EntitySpawnTicket& ticket, ListIndicesEntitiesCallback listCallback)
+    {
+        AZ_Assert(listCallback, "ListEntities called on spawnable entities without a valid callback to use.");
+        AZ_Assert(ticket.IsValid(), "Ticket provided to ListEntities hasn't been initialized.");
+
+        ListIndicesEntitiesCommand queueEntry;
+        queueEntry.m_ticket = &ticket;
+        queueEntry.m_listCallback = AZStd::move(listCallback);
+        {
+            AZStd::scoped_lock queueLock(m_pendingRequestQueueMutex);
+            queueEntry.m_ticketId = GetTicketPayload<Ticket>(ticket).m_nextTicketId++;
+            m_pendingRequestQueue.push(AZStd::move(queueEntry));
+        }
+    }
+
     void SpawnableEntitiesManager::ClaimEntities(EntitySpawnTicket& ticket, ClaimEntitiesCallback listCallback)
     {
         AZ_Assert(listCallback, "ClaimEntities called on spawnable entities without a valid callback to use.");
+        AZ_Assert(ticket.IsValid(), "Ticket provided to ClaimEntities hasn't been initialized.");
 
         ClaimEntitiesCommand queueEntry;
         queueEntry.m_ticket = &ticket;
@@ -109,6 +134,7 @@ namespace AzFramework
     void SpawnableEntitiesManager::Barrier(EntitySpawnTicket& ticket, BarrierCallback completionCallback)
     {
         AZ_Assert(completionCallback, "Barrier on spawnable entities called without a valid callback to use.");
+        AZ_Assert(ticket.IsValid(), "Ticket provided to Barrier hasn't been initialized.");
 
         BarrierCommand queueEntry;
         queueEntry.m_ticket = &ticket;
@@ -499,6 +525,27 @@ namespace AzFramework
         }
     }
 
+    bool SpawnableEntitiesManager::ProcessRequest(ListIndicesEntitiesCommand& request, [[maybe_unused]] AZ::SerializeContext& serializeContext)
+    {
+        Ticket& ticket = GetTicketPayload<Ticket>(*request.m_ticket);
+        if (request.m_ticketId == ticket.m_currentTicketId)
+        {
+            AZ_Assert(
+                ticket.m_spawnedEntities.size() == ticket.m_spawnedEntityIndices.size(),
+                "Entities and indices on spawnable ticket have gone out of sync.");
+            request.m_listCallback(
+                *request.m_ticket,
+                SpawnableConstIndexEntityContainerView(
+                    ticket.m_spawnedEntities.begin(), ticket.m_spawnedEntityIndices.begin(), ticket.m_spawnedEntities.size()));
+            ticket.m_currentTicketId++;
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     bool SpawnableEntitiesManager::ProcessRequest(ClaimEntitiesCommand& request, [[maybe_unused]] AZ::SerializeContext& serializeContext)
     {
         Ticket& ticket = GetTicketPayload<Ticket>(*request.m_ticket);
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
index e20f58ac76..3481ab180a 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.h
@@ -36,6 +36,7 @@ namespace AzFramework
     {
     public:
         AZ_RTTI(AzFramework::SpawnableEntitiesManager, "{6E14333F-128C-464C-94CA-A63B05A5E51C}");
+        AZ_CLASS_ALLOCATOR(SpawnableEntitiesManager, AZ::SystemAllocator, 0);
 
         enum class CommandQueueStatus : bool
         {
@@ -58,6 +59,7 @@ namespace AzFramework
             ReloadSpawnableCallback completionCallback = {}) override;
 
         void ListEntities(EntitySpawnTicket& ticket, ListEntitiesCallback listCallback) override;
+        void ListIndicesAndEntities(EntitySpawnTicket& ticket, ListIndicesEntitiesCallback listCallback) override;
         void ClaimEntities(EntitySpawnTicket& ticket, ClaimEntitiesCallback listCallback) override;
 
         void Barrier(EntitySpawnTicket& spawnInfo, BarrierCallback completionCallback) override;
@@ -123,6 +125,12 @@ namespace AzFramework
             EntitySpawnTicket* m_ticket;
             uint32_t m_ticketId;
         };
+        struct ListIndicesEntitiesCommand
+        {
+            ListIndicesEntitiesCallback m_listCallback;
+            EntitySpawnTicket* m_ticket;
+            uint32_t m_ticketId;
+        };
         struct ClaimEntitiesCommand
         {
             ClaimEntitiesCallback m_listCallback;
@@ -141,8 +149,9 @@ namespace AzFramework
             uint32_t m_ticketId;
         };
 
-        using Requests = AZStd::variant<SpawnAllEntitiesCommand, SpawnEntitiesCommand, DespawnAllEntitiesCommand, ReloadSpawnableCommand,
-            ListEntitiesCommand, ClaimEntitiesCommand, BarrierCommand, DestroyTicketCommand>;
+        using Requests = AZStd::variant<
+            SpawnAllEntitiesCommand, SpawnEntitiesCommand, DespawnAllEntitiesCommand, ReloadSpawnableCommand, ListEntitiesCommand,
+            ListIndicesEntitiesCommand, ClaimEntitiesCommand, BarrierCommand, DestroyTicketCommand>;
 
         AZ::Entity* SpawnSingleEntity(const AZ::Entity& entityTemplate,
             AZ::SerializeContext& serializeContext);
@@ -155,6 +164,7 @@ namespace AzFramework
         bool ProcessRequest(DespawnAllEntitiesCommand& request, AZ::SerializeContext& serializeContext);
         bool ProcessRequest(ReloadSpawnableCommand& request, AZ::SerializeContext& serializeContext);
         bool ProcessRequest(ListEntitiesCommand& request, AZ::SerializeContext& serializeContext);
+        bool ProcessRequest(ListIndicesEntitiesCommand& request, AZ::SerializeContext& serializeContext);
         bool ProcessRequest(ClaimEntitiesCommand& request, AZ::SerializeContext& serializeContext);
         bool ProcessRequest(BarrierCommand& request, AZ::SerializeContext& serializeContext);
         bool ProcessRequest(DestroyTicketCommand& request, AZ::SerializeContext& serializeContext);
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
index 884562d7e8..28971dc779 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
@@ -41,6 +41,7 @@ namespace AzManipulatorTestFramework
         AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override;
         AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
             const AzFramework::ScreenPoint& screenPosition) override;
+        float DeviceScalingFactor() override;
     private:
         // ViewportInteractionRequestBus ...
         bool GridSnappingEnabled();
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
index ebef9dea30..7d32187a74 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
@@ -127,4 +127,9 @@ namespace AzManipulatorTestFramework
     {
         return {};
     }
-} // namespace AzManipulatorTestFramework
+
+    float ViewportInteraction::DeviceScalingFactor()
+    {
+        return 1.0f;
+    }
+}// namespace AzManipulatorTestFramework
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Local.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Local.svg
new file mode 100644
index 0000000000..2017cabe21
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Local.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Local</title>
+    <g id="Icon-/-Local" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+        <polygon id="L" fill="#FFFFFF" fill-rule="nonzero" points="16.9658203 19 16.9658203 16.5 11.1748047 16.5 11.1748047 4.72265625 8.14746094 4.72265625 8.14746094 19"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Parent.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Parent.svg
new file mode 100644
index 0000000000..c0b9580985
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Parent.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Parent</title>
+    <g id="Icon-/-Parent" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+        <path d="M10.5449219,19 L10.5449219,13.921875 L11.84375,13.921875 C13.6145833,13.921875 14.9801432,13.514974 15.9404297,12.7011719 C16.9007161,11.8873698 17.3808594,10.7122396 17.3808594,9.17578125 C17.3808594,7.69791667 16.930013,6.58626302 16.0283203,5.84082031 C15.1266276,5.0953776 13.8098958,4.72265625 12.078125,4.72265625 L12.078125,4.72265625 L7.51757812,4.72265625 L7.51757812,19 L10.5449219,19 Z M11.5410156,11.4414062 L10.5449219,11.4414062 L10.5449219,7.203125 L11.921875,7.203125 C12.7486979,7.203125 13.3557943,7.37239583 13.7431641,7.7109375 C14.1305339,8.04947917 14.3242188,8.57356771 14.3242188,9.28320312 C14.3242188,9.98632812 14.093099,10.5218099 13.6308594,10.8896484 C13.1686198,11.257487 12.4720052,11.4414062 11.5410156,11.4414062 L11.5410156,11.4414062 Z" id="P" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/World.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/World.svg
new file mode 100644
index 0000000000..4d77775e3d
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/World.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / World</title>
+    <g id="Icon-/-World" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="Rectangle" x="0" y="0" width="24" height="24"></rect>
+        <path d="M9.41210938,19 L11.3359375,11.5195312 C11.4205729,11.1875 11.5410156,10.632487 11.6972656,9.85449219 C11.8535156,9.0764974 11.9511719,8.51171875 11.9902344,8.16015625 C12.016276,8.44661458 12.1155599,9.00813802 12.2880859,9.84472656 C12.460612,10.6813151 12.5826823,11.2330729 12.6542969,11.5 L12.6542969,11.5 L14.5878906,19 L18.0351562,19 L21.6679688,4.72265625 L18.6894531,4.72265625 L16.8730469,12.515625 C16.7558594,12.984375 16.625651,13.5979818 16.4824219,14.3564453 C16.3391927,15.1149089 16.235026,15.7480469 16.1699219,16.2558594 C16.0983073,15.7285156 15.9941406,15.0970052 15.8574219,14.3613281 C15.7207031,13.625651 15.6067708,13.078776 15.515625,12.7207031 L15.515625,12.7207031 L13.4355469,4.72265625 L10.5742188,4.72265625 L8.49414062,12.7207031 C8.37044271,13.1503906 8.23860677,13.7542318 8.09863281,14.5322266 C7.95865885,15.3102214 7.86914062,15.8847656 7.83007812,16.2558594 C7.68684896,15.2011719 7.45572917,13.9544271 7.13671875,12.515625 L7.13671875,12.515625 L5.31054688,4.72265625 L2.33203125,4.72265625 L5.97460938,19 L9.41210938,19 Z" id="W" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
index 8ea4755a24..00fa95d094 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc
@@ -354,6 +354,7 @@
     <file>img/UI20/toolbar/Grid.svg</file>
     <file>img/UI20/toolbar/Lighting.svg</file>
     <file>img/UI20/toolbar/Load.svg</file>
+	<file>img/UI20/toolbar/Local.svg</file>
     <file>img/UI20/toolbar/Locked.svg</file>
     <file>img/UI20/toolbar/LUA.svg</file>
     <file>img/UI20/toolbar/Material.svg</file>
@@ -362,6 +363,7 @@
     <file>img/UI20/toolbar/Object_follow_terrain.svg</file>
     <file>img/UI20/toolbar/Object_height.svg</file>
     <file>img/UI20/toolbar/Object_list.svg</file>
+	<file>img/UI20/toolbar/Parent.svg</file>
     <file>img/UI20/toolbar/particle.svg</file>
     <file>img/UI20/toolbar/Play.svg</file>
     <file>img/UI20/toolbar/Redo.svg</file>
@@ -380,6 +382,7 @@
     <file>img/UI20/toolbar/undo.svg</file>
     <file>img/UI20/toolbar/Unlocked.svg</file>
     <file>img/UI20/toolbar/Vertex_snapping.svg</file>
+	<file>img/UI20/toolbar/World.svg</file>
     <file>img/UI20/toolbar/X_axis.svg</file>
     <file>img/UI20/toolbar/Y_axis.svg</file>
     <file>img/UI20/toolbar/Z_axis.svg</file>
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
index 98e4c6b5eb..715de30bfa 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h
@@ -60,10 +60,20 @@ namespace AzToolsFramework
             //! and is generally checked into source control.
             virtual const char* GetAbsoluteDevRootFolderPath() = 0;
         
-            /// Convert a full source path like "c:\\dev\gamename\\blah\\test.tga" into a relative product path.
+            /// Convert a full source path like "c:\\dev\\gamename\\blah\\test.tga" into a relative product path.
             /// asset paths never mention their alias and are relative to the asset cache root
             virtual bool GetRelativeProductPathFromFullSourceOrProductPath(const AZStd::string& fullPath, AZStd::string& relativeProductPath) = 0;
 
+            /** Convert a source path like "c:\\dev\\gamename\\blah\\test.tga" into a relative source path, like "blah/test.tga".
+            * If no valid relative path could be created, the input source path will be returned in relativePath.
+            * @param sourcePath partial or full path to a source file.  (The file doesn't need to exist)
+            * @param relativePath the output relative path for the source file, if a valid one could be created
+            * @param rootFilePath the root path that relativePath is relative to
+            * @return true if a valid relative path was created, false if it wasn't
+            */
+            virtual bool GenerateRelativeSourcePath(
+                const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& rootFilePath) = 0;
+
             /// Convert a relative asset path like "blah/test.tga" to a full source path path.
             /// Once the asset processor has finished building, this function is capable of handling even when the extension changes
             /// or when the source is in a different folder or in a different location (such as inside gems)
@@ -110,14 +120,14 @@ namespace AzToolsFramework
 
             /**
             * Query to see if a specific asset platform is enabled
-            * @param platform the asset platform to check e.g. es3, ios, etc.
+            * @param platform the asset platform to check e.g. android, ios, etc.
             * @return true if enabled, false otherwise
             */
             virtual bool IsAssetPlatformEnabled(const char* platform) = 0;
 
             /**
             * Get the total number of pending assets left to process for a specific asset platform
-            * @param platform the asset platform to check e.g. es3, ios, etc.
+            * @param platform the asset platform to check e.g. android, ios, etc.
             * @return -1 if the process fails, a positive number otherwise
             */
             virtual int GetPendingAssetsForPlatform(const char* platform) = 0;
@@ -302,7 +312,7 @@ namespace AzToolsFramework
         inline const char* GetHostAssetPlatform()
         {
 #if defined(AZ_PLATFORM_MAC)
-            return "osx_gl";
+            return "mac";
 #elif defined(AZ_PLATFORM_WINDOWS)
             return "pc";
 #elif defined(AZ_PLATFORM_LINUX)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h
new file mode 100644
index 0000000000..a2264b5058
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorViewportIconDisplayInterface.h
@@ -0,0 +1,80 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Interface/Interface.h>
+#include <AzCore/Math/Color.h>
+
+#include <AzFramework/Viewport/ViewportId.h>
+
+namespace AzToolsFramework
+{
+    //! An interface for loading simple icon assets and rendering them to screen on a per-viewport basis.
+    class EditorViewportIconDisplayInterface
+    {
+    public:
+        AZ_RTTI(EditorViewportIconDisplayInterface, "{D5190B58-2561-4F3F-B793-F1E7D454CDF2}");
+
+        using IconId = AZ::s32;
+        static constexpr IconId InvalidIconId = -1;
+
+        enum class CoordinateSpace : AZ::u8
+        {
+            ScreenSpace,
+            WorldSpace
+        };
+
+        //! These draw parameters control rendering for a single icon to a single viewport.
+        struct DrawParameters
+        {
+            //! The ViewportId to render to.
+            AzFramework::ViewportId m_viewport = AzFramework::InvalidViewportId;
+            //! The icon ID, retrieved from GetOrLoadIconForPath, to render to screen.
+            IconId m_icon = InvalidIconId;
+            //! The color, including opacity, to render the icon with. White will render the icon as opaque in its original color.
+            AZ::Color m_color = AZ::Colors::White;
+            //! The position to render the icon to, in world or screen space depending on m_positionSpace.
+            AZ::Vector3 m_position;
+            //! The coordinate system to use for m_position.
+            //! ScreenSpace will accept m_position in the form of [X, Y, Depth], where X & Y are screen coordinates in
+            //! pixels and Depth is a z-ordering depth value from 0.0f to 1.0f.
+            //! WorldSpace will accept a 3D vector in world space coordinates that will be translated back into screen
+            //! space when the icon is rendered.
+            CoordinateSpace m_positionSpace = CoordinateSpace::ScreenSpace;
+            //! The size to render the icon as, in pixels.
+            AZ::Vector2 m_size;
+        };
+
+        //! The current load status of an icon retrieved by GetOrLoadIconForPath.
+        enum class IconLoadStatus : AZ::u8
+        {
+            Unloaded,
+            Loading,
+            Loaded,
+            Error
+        };
+
+        //! Draws an icon to a viewport given a set of draw parameters.
+        //! Requires an IconId retrieved from GetOrLoadIconForPath.
+        virtual void DrawIcon(const DrawParameters& drawParameters) = 0;
+        //! Retrieves a reusable IconId for an icon at a given path.
+        //! This will load the icon, if it has not already been loaded.
+        //! @param path should be a relative asset path to an icon image asset.
+        //! png and svg icons are currently supported.
+        virtual IconId GetOrLoadIconForPath(AZStd::string_view path) = 0;
+        //! Gets the current load status of an icon retrieved via GetOrLoadIconForPath.
+        virtual IconLoadStatus GetIconLoadStatus(IconId icon) = 0;
+    };
+
+    using EditorViewportIconDisplay = AZ::Interface<EditorViewportIconDisplayInterface>;
+} //namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
index 82fa3f94f5..72150b1b57 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h
@@ -239,6 +239,11 @@ namespace AzToolsFramework
         */
         virtual int RemoveDirtyEntity(AZ::EntityId target) = 0;
 
+        /*!
+         * Clears the dirty entity set.
+         */
+        virtual void ClearDirtyEntities() = 0;
+
         /*!
          * \return true if an undo/redo operation is in progress.
          */
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
index e77704c920..88057787bb 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp
@@ -1354,6 +1354,11 @@ namespace AzToolsFramework
         return static_cast<int>(m_dirtyEntities.erase(entityId));
     }
 
+    void ToolsApplication::ClearDirtyEntities()
+    {
+        m_dirtyEntities.clear();
+    }
+
     void ToolsApplication::UndoPressed()
     {
         if (m_undoStack)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
index 6c836ac888..bafced67bd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
@@ -85,6 +85,7 @@ namespace AzToolsFramework
 
         void AddDirtyEntity(AZ::EntityId entityId) override;
         int RemoveDirtyEntity(AZ::EntityId entityId) override;
+        void ClearDirtyEntities() override;
         bool IsDuringUndoRedo() override { return m_isDuringUndoRedo; }
         void UndoPressed() override;
         void RedoPressed() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
index 5529829913..4966d9cce9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp
@@ -265,6 +265,30 @@ namespace AzToolsFramework
             return response.m_resolved;
         }
 
+        bool AssetSystemComponent::GenerateRelativeSourcePath(
+            const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& rootFilePath)
+        {
+            AzFramework::SocketConnection* engineConnection = AzFramework::SocketConnection::GetInstance();
+            if (!engineConnection || !engineConnection->IsConnected())
+            {
+                relativePath = sourcePath;
+                return false;
+            }
+
+            AzFramework::AssetSystem::GenerateRelativeSourcePathRequest request(sourcePath);
+            AzFramework::AssetSystem::GenerateRelativeSourcePathResponse response;
+            if (!SendRequest(request, response))
+            {
+                AZ_Error("Editor", false, "Failed to send GenerateRelativeSourcePath request for %s", sourcePath.c_str());
+                relativePath = sourcePath;
+                return false;
+            }
+
+            relativePath = response.m_relativeSourcePath;
+            rootFilePath = response.m_rootFolder;
+            return response.m_resolved;
+        }
+
         bool AssetSystemComponent::GetFullSourcePathFromRelativeProductPath(const AZStd::string& relPath, AZStd::string& fullPath)
         {
             auto foundIt = m_assetSourceRelativePathToFullPathCache.find(relPath);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
index 399ee1ac9d..9d839c60f5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.h
@@ -63,6 +63,8 @@ namespace AzToolsFramework
             const char* GetAbsoluteDevGameFolderPath() override;
             const char* GetAbsoluteDevRootFolderPath() override;
             bool GetRelativeProductPathFromFullSourceOrProductPath(const AZStd::string& fullPath, AZStd::string& outputPath) override;
+            bool GenerateRelativeSourcePath(
+                const AZStd::string& sourcePath, AZStd::string& outputPath, AZStd::string& watchFolder) override;
             bool GetFullSourcePathFromRelativeProductPath(const AZStd::string& relPath, AZStd::string& fullPath) override;
             bool GetAssetInfoById(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType& assetType, const AZStd::string& platformName, AZ::Data::AssetInfo& assetInfo, AZStd::string& rootFilePath) override;
             bool GetSourceInfoBySourcePath(const char* sourcePath, AZ::Data::AssetInfo& assetInfo, AZStd::string& watchFolder) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
index 8412361657..32ea9db3da 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
@@ -56,5 +56,7 @@ namespace AzToolsFramework
         
         virtual void StartPlayInEditor() = 0;
         virtual void StopPlayInEditor() = 0;
+
+        virtual void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) = 0;
     };
 }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
index 97c3041de6..439789f11b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
@@ -225,50 +225,19 @@ namespace AzToolsFramework
 
         m_rootInstance->SetTemplateSourcePath(relativePath);
 
-        bool newLevelFromTemplate = false;
-
         if (templateId == AzToolsFramework::Prefab::InvalidTemplateId)
         {
-            AZStd::string watchFolder;
-            AZ::Data::AssetInfo assetInfo;
-            bool sourceInfoFound = false;
-            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
-                sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, DefaultLevelTemplateName,
-                assetInfo, watchFolder);
+            m_rootInstance->m_containerEntity->AddComponent(aznew Prefab::EditorPrefabComponent());
+            HandleEntitiesAdded({ m_rootInstance->m_containerEntity.get() });
 
-            if (sourceInfoFound)
+            AzToolsFramework::Prefab::PrefabDom dom;
+            bool success = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*m_rootInstance, dom);
+            if (!success)
             {
-                AZStd::string fullPath;
-                AZ::StringFunc::Path::Join(watchFolder.c_str(), assetInfo.m_relativePath.c_str(), fullPath);
-
-                // Get the default prefab and copy the Dom over to the new template being saved
-                Prefab::TemplateId defaultId = m_loaderInterface->LoadTemplateFromFile(fullPath.c_str());
-                Prefab::PrefabDom& dom = m_prefabSystemComponent->FindTemplateDom(defaultId);
-
-                Prefab::PrefabDom levelDefaultDom;
-                levelDefaultDom.CopyFrom(dom, levelDefaultDom.GetAllocator());
-
-                Prefab::PrefabDomPath sourcePath("/Source");
-                sourcePath.Set(levelDefaultDom, relativePath.c_str());
-
-                templateId = m_prefabSystemComponent->AddTemplate(relativePath, std::move(levelDefaultDom));
-                newLevelFromTemplate = true;
-            }
-            else
-            {
-                // Create an empty level since we couldn't find the default template
-                m_rootInstance->m_containerEntity->AddComponent(aznew Prefab::EditorPrefabComponent());
-                HandleEntitiesAdded({ m_rootInstance->m_containerEntity.get() });
-
-                AzToolsFramework::Prefab::PrefabDom dom;
-                bool success = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*m_rootInstance, dom);
-                if (!success)
-                {
-                    AZ_Error("Prefab", false, "Failed to convert current root instance into a DOM when saving file '%.*s'", AZ_STRING_ARG(filename));
-                    return false;
-                }
-                templateId = m_prefabSystemComponent->AddTemplate(relativePath, std::move(dom));
+                AZ_Error("Prefab", false, "Failed to convert current root instance into a DOM when saving file '%.*s'", AZ_STRING_ARG(filename));
+                return false;
             }
+            templateId = m_prefabSystemComponent->AddTemplate(relativePath, AZStd::move(dom));
 
             if (templateId == AzToolsFramework::Prefab::InvalidTemplateId)
             {
@@ -286,13 +255,6 @@ namespace AzToolsFramework
             m_prefabSystemComponent->RemoveTemplate(prevTemplateId);
         }
 
-        // If we have a new level from a template, we need to make sure to propagate the changes here otherwise
-        // the entities from the new template won't show up
-        if (newLevelFromTemplate)
-        {
-            m_prefabSystemComponent->PropagateTemplateChanges(templateId);
-        }
-
         AZStd::string out;
         if (m_loaderInterface->SaveTemplateToString(m_rootInstance->GetTemplateId(), out))
         {
@@ -303,6 +265,71 @@ namespace AzToolsFramework
         return false;
     }
 
+    void PrefabEditorEntityOwnershipService::CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename)
+    {
+        AZ::IO::Path relativePath = m_loaderInterface->GetRelativePathToProject(filename);
+        AzToolsFramework::Prefab::TemplateId templateId = m_prefabSystemComponent->GetTemplateIdFromFilePath(relativePath);
+
+        m_rootInstance->SetTemplateSourcePath(relativePath);
+
+        AZStd::string watchFolder;
+        AZ::Data::AssetInfo assetInfo;
+        bool sourceInfoFound = false;
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, templateFilename.c_str(),
+            assetInfo, watchFolder);
+
+        if (sourceInfoFound)
+        {
+            AZStd::string fullPath;
+            AZ::StringFunc::Path::Join(watchFolder.c_str(), assetInfo.m_relativePath.c_str(), fullPath);
+
+            // Get the default prefab and copy the Dom over to the new template being saved
+            Prefab::TemplateId defaultId = m_loaderInterface->LoadTemplateFromFile(fullPath.c_str());
+            Prefab::PrefabDom& dom = m_prefabSystemComponent->FindTemplateDom(defaultId);
+
+            Prefab::PrefabDom levelDefaultDom;
+            levelDefaultDom.CopyFrom(dom, levelDefaultDom.GetAllocator());
+
+            Prefab::PrefabDomPath sourcePath("/Source");
+            sourcePath.Set(levelDefaultDom, relativePath.c_str());
+
+            templateId = m_prefabSystemComponent->AddTemplate(relativePath, AZStd::move(levelDefaultDom));
+        }
+        else
+        {
+            m_rootInstance->m_containerEntity->AddComponent(aznew Prefab::EditorPrefabComponent());
+            HandleEntitiesAdded({ m_rootInstance->m_containerEntity.get() });
+
+            AzToolsFramework::Prefab::PrefabDom dom;
+            bool success = AzToolsFramework::Prefab::PrefabDomUtils::StoreInstanceInPrefabDom(*m_rootInstance, dom);
+            if (!success)
+            {
+                AZ_Error(
+                    "Prefab", false, "Failed to convert current root instance into a DOM when saving file '%.*s'", AZ_STRING_ARG(filename));
+                return;
+            }
+            templateId = m_prefabSystemComponent->AddTemplate(relativePath, std::move(dom));
+        }
+
+        if (templateId == AzToolsFramework::Prefab::InvalidTemplateId)
+        {
+            AZ_Error("Prefab", false, "Couldn't create new template id '%i' when creating new level '%.*s'", templateId, AZ_STRING_ARG(filename));
+            return;
+        }
+
+        Prefab::TemplateId prevTemplateId = m_rootInstance->GetTemplateId();
+        m_rootInstance->SetTemplateId(templateId);
+
+        if (prevTemplateId != Prefab::InvalidTemplateId && templateId != prevTemplateId)
+        {
+            // Make sure we only have one level template loaded at a time
+            m_prefabSystemComponent->RemoveTemplate(prevTemplateId);
+        }
+
+        m_prefabSystemComponent->PropagateTemplateChanges(templateId);
+    }
+
     Prefab::InstanceOptionalReference PrefabEditorEntityOwnershipService::CreatePrefab(
         const AZStd::vector<AZ::Entity*>& entities, AZStd::vector<AZStd::unique_ptr<Prefab::Instance>>&& nestedPrefabInstances,
         AZ::IO::PathView filePath, Prefab::InstanceOptionalReference instanceToParentUnder)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
index 606d5f495f..d8eb81dd40 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
@@ -170,6 +170,8 @@ namespace AzToolsFramework
         void StartPlayInEditor() override;
         void StopPlayInEditor() override;
 
+        void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) override;
+
     protected:
 
         AZ::SliceComponent::SliceInstanceAddress GetOwningSlice() override;
@@ -216,7 +218,5 @@ namespace AzToolsFramework
         Prefab::PrefabLoaderInterface* m_loaderInterface;
         AzFramework::EntityContextId m_entityContextId;
         AZ::SerializeContext m_serializeContext;
-
-        static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
     };
 }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
index 906ea98357..14dcf5e55d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp
@@ -614,7 +614,7 @@ namespace AzToolsFramework
 
                                     AZ::Quaternion oldEntityRotation;
                                     AZ::TransformBus::EventResult(oldEntityRotation, id, &AZ::TransformBus::Events::GetWorldRotationQuaternion);
-                                    transformComponent->SetRotationQuaternion(oldEntityRotation);
+                                    transformComponent->SetWorldRotationQuaternion(oldEntityRotation);
 
                                     // Ensure the existing hierarchy is maintained
                                     AZ::EntityId oldParentEntityId;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
index a8fe0e55bd..8874e0dcd9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
@@ -31,7 +31,7 @@ namespace AzToolsFramework
             rayProportion, lineSegmentProportion, worldClosestPositionRay, worldClosestPositionLineSegment);
 
         AZ::Transform worldFromLocalNormalized = worldFromLocal;
-        const AZ::Vector3 scale = worldFromLocalNormalized.ExtractScale() * nonUniformScale;
+        const AZ::Vector3 scale = worldFromLocalNormalized.ExtractUniformScale() * nonUniformScale;
         const AZ::Transform localFromWorldNormalized = worldFromLocalNormalized.GetInverse();
 
         return { (localFromWorldNormalized.TransformPoint(worldClosestPositionLineSegment)) / scale };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
index 87d966fe84..aa84fc5752 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
@@ -59,7 +59,7 @@ namespace AzToolsFramework
             ? CalculateSnappedOffset(localTransform.GetTranslation(), axis, gridSize * scaleRecip)
             : AZ::Vector3::CreateZero();
 
-        const AZ::Vector3 localScale = localTransform.GetScale();
+        const AZ::Vector3 localScale = AZ::Vector3(localTransform.GetUniformScale());
         const AZ::Quaternion localRotation = QuaternionFromTransformNoScaling(localTransform);
         // calculate scale amount to snap, to align to round scale value
         const AZ::Vector3 scaleSnapOffset = snapping && !gridSnapAction.m_localSnapping
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
index db0baa1479..e6c70079df 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
@@ -113,7 +113,7 @@ namespace AzToolsFramework
     /// noise in the value returned when dealing with values far from the origin.
     inline float ScaleReciprocal(const AZ::Transform& transform)
     {
-        return Round3(transform.GetScale().GetReciprocal().GetMinElement());
+        return Round3(1.0f / transform.GetUniformScale());
     }
 
     /// Find the reciprocal of the non-uniform scale.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
index fba7e35078..cd08a95af7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
@@ -39,7 +39,7 @@ namespace AzToolsFramework
         AZ::Transform result;
         result.SetRotation(m_space.GetRotation() * localTransform.GetRotation());
         result.SetTranslation(m_space.TransformPoint(m_nonUniformScale * localTransform.GetTranslation()));
-        result.SetScale(m_space.GetScale() * localTransform.GetScale());
+        result.SetScale(m_space.GetScale() * localTransform.GetUniformScale());
         return result;
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
index 97add27604..a3cc12566f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Maths/TransformUtils.h
@@ -23,7 +23,7 @@ namespace AzToolsFramework
     inline AZ::Transform TransformNormalizedScale(const AZ::Transform& transform)
     {
         AZ::Transform transformNormalizedScale = transform;
-        transformNormalizedScale.SetScale(AZ::Vector3::CreateOne());
+        transformNormalizedScale.SetUniformScale(1.0f);
         return transformNormalizedScale;
     }
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
index a21c5301aa..6d3ddedd51 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
@@ -276,18 +276,14 @@ namespace AzToolsFramework
             PrefabDomValueReference linkPatchesReference =
                 PrefabDomUtils::FindPrefabDomValue(linkDom, PrefabDomUtils::PatchesName);
 
-            // This logic only covers addition of patches. If patches already exists, the given list of patches must be appended to them.
-            if (!linkPatchesReference.has_value())
-            {
-                /*
-                If the original allocator the patches were created with gets destroyed, then the patches would become garbage in the
-                linkDom. Since we cannot guarantee the lifecycle of the patch allocators, we are doing a copy of the patches here to
-                associate them with the linkDom's allocator.
-                */
-                PrefabDom patchesCopy;
-                patchesCopy.CopyFrom(patches, linkDom.GetAllocator());
-                linkDom.AddMember(rapidjson::StringRef(PrefabDomUtils::PatchesName), patchesCopy, linkDom.GetAllocator());
-            }
+            /*
+            If the original allocator the patches were created with gets destroyed, then the patches would become garbage in the
+            linkDom. Since we cannot guarantee the lifecycle of the patch allocators, we are doing a copy of the patches here to
+            associate them with the linkDom's allocator.
+            */
+            PrefabDom patchesCopy;
+            patchesCopy.CopyFrom(patches, linkDom.GetAllocator());
+            linkDom.AddMember(rapidjson::StringRef(PrefabDomUtils::PatchesName), patchesCopy, linkDom.GetAllocator());
         }
     }
 }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
index 308749ab28..2fb22ea8e8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp
@@ -234,5 +234,10 @@ namespace AzToolsFramework
             }
         }
 
+        PrefabDomValueReference Link::GetLinkPatches()
+        {
+            return PrefabDomUtils::FindPrefabDomValue(m_linkDom, PrefabDomUtils::PatchesName);
+        }
+
     } // namespace Prefab
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
index 073e619f20..c8f43b291e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.h
@@ -79,6 +79,8 @@ namespace AzToolsFramework
              */
             void AddLinkIdToInstanceDom(PrefabDomValue& instanceDomValue);
 
+            PrefabDomValueReference GetLinkPatches();
+
         private:
 
             /**
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
index 7b4761c39a..2965148172 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabLoader.cpp
@@ -41,7 +41,7 @@ namespace AzToolsFramework
             
             [[maybe_unused]] bool result =
                 settingsRegistry->Get(m_projectPathWithOsSeparator.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath);
-            AZ_Assert(result, "Couldn't retrieve project root path");
+            AZ_Warning("Prefab", result, "Couldn't retrieve project root path");
             m_projectPathWithSlashSeparator = AZ::IO::Path(m_projectPathWithOsSeparator.Native(), '/').MakePreferred();
 
             AZ::Interface<PrefabLoaderInterface>::Register(this);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 579f465eb2..0181050a32 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include <AzToolsFramework/Prefab/PrefabPublicHandler.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/JSON/stringbuffer.h>
 #include <AzCore/JSON/writer.h>
@@ -28,6 +26,7 @@
 #include <AzToolsFramework/Prefab/Instance/InstanceToTemplateInterface.h>
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 #include <AzToolsFramework/Prefab/PrefabLoaderInterface.h>
+#include <AzToolsFramework/Prefab/PrefabPublicHandler.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/PrefabUndo.h>
 #include <AzToolsFramework/Prefab/PrefabUndoHelpers.h>
@@ -98,9 +97,13 @@ namespace AzToolsFramework
                         AZStd::string("Could not create a new prefab out of the entities provided - invalid selection."));
                 }
 
+                AZStd::unordered_map<AZ::EntityId, AZStd::string> oldEntityAliases;
+
                 // Detach the retrieved entities
                 for (AZ::Entity* entity : entities)
                 {
+                    AZ::EntityId entityId = entity->GetId();
+                    oldEntityAliases.emplace(entityId, commonRootEntityOwningInstance->get().GetEntityAlias(entityId)->get());
                     commonRootEntityOwningInstance->get().DetachEntity(entity->GetId()).release();
                 }
 
@@ -110,15 +113,18 @@ namespace AzToolsFramework
                 {
                     AZStd::unique_ptr<Instance> outInstance = commonRootEntityOwningInstance->get().DetachNestedInstance(nestedInstance->GetInstanceAlias());
 
-                    auto linkRef = m_prefabSystemComponentInterface->FindLink(nestedInstance->GetLinkId());
+                    LinkId detachingInstanceLinkId = nestedInstance->GetLinkId();
+                    auto linkRef = m_prefabSystemComponentInterface->FindLink(detachingInstanceLinkId);
+                    AZ_Assert(linkRef.has_value(), "Unable to find link with id '%llu' during prefab creation.", detachingInstanceLinkId);
 
-                    if (linkRef.has_value())
-                    {
-                        PrefabDom oldLinkPatches;
-                        oldLinkPatches.CopyFrom(linkRef->get().GetLinkDom(), oldLinkPatches.GetAllocator());
+                    PrefabDomValueReference linkPatches = linkRef->get().GetLinkPatches();
+                    AZ_Assert(
+                        linkPatches.has_value(), "Unable to get patches on link with id '%llu' during prefab creation.",
+                        detachingInstanceLinkId);
 
-                        nestedInstanceLinkPatchesMap.emplace(nestedInstance, AZStd::move(oldLinkPatches));
-                    }
+                    PrefabDom linkPatchesCopy;
+                    linkPatchesCopy.CopyFrom(linkPatches->get(), linkPatchesCopy.GetAllocator());
+                    nestedInstanceLinkPatchesMap.emplace(nestedInstance, AZStd::move(linkPatchesCopy));
                     
                     RemoveLink(outInstance, commonRootEntityOwningInstance->get().GetTemplateId(), undoBatch.GetUndoBatch());
 
@@ -182,6 +188,24 @@ namespace AzToolsFramework
                     if (nestedInstanceLinkPatchesMap.contains(nestedInstance.get()))
                     {
                         previousPatch = AZStd::move(nestedInstanceLinkPatchesMap[nestedInstance.get()]);
+                        rapidjson::StringBuffer buffer;
+                        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+                        previousPatch.Accept(writer);
+                        QString previousPatchString(buffer.GetString());
+
+                        for (AZ::Entity* entity : entities)
+                        {
+                            AZ::EntityId entityId = entity->GetId();
+                            AZStd::string oldEntityAlias = oldEntityAliases[entityId];
+                            EntityAliasOptionalReference newEntityAlias = instanceToCreate->get().GetEntityAlias(entityId);
+                            AZ_Assert(
+                                newEntityAlias.has_value(),
+                                "Could not fetch entity alias for entity with id '%llu' during prefab creation.",
+                                static_cast<AZ::u64>(entityId));
+                            ReplaceOldAliases(previousPatchString, oldEntityAlias, newEntityAlias->get());
+                        }
+
+                        previousPatch.Parse(previousPatchString.toUtf8().constData());
                     }
 
                     // These link creations shouldn't be undone because that would put the template in a non-usable state if a user
@@ -203,36 +227,23 @@ namespace AzToolsFramework
                         m_instanceToTemplateInterface->GeneratePatch(reparentPatch, containerEntityDomBefore, containerEntityDomAfter);
                         m_instanceToTemplateInterface->AppendEntityAliasToPatchPaths(reparentPatch, nestedInstanceContainerEntityId);
 
-                        // Update the cache - this prevents these changes from being stored in the regular undo/redo nodes as a separate step
-                        m_prefabUndoCache.Store(nestedInstanceContainerEntityId, AZStd::move(containerEntityDomAfter));
-
-                        // Save these changes as patches to the link
-                        PrefabUndoLinkUpdate* linkUpdate = aznew PrefabUndoLinkUpdate(AZStd::to_string(static_cast<AZ::u64>(nestedInstanceContainerEntityId)));
-                        linkUpdate->SetParent(undoBatch.GetUndoBatch());
-                        linkUpdate->Capture(reparentPatch, nestedInstance->GetLinkId());
-
-                        linkUpdate->Redo();
+                        // We won't parent this undo node to the undo batch so that the newly created template and link will remain
+                        // unaffected by undo actions. This is needed so that any future instantiations of the template will work.
+                        PrefabUndoLinkUpdate linkUpdate = PrefabUndoLinkUpdate(AZStd::to_string(static_cast<AZ::u64>(nestedInstanceContainerEntityId)));
+                        linkUpdate.Capture(reparentPatch, nestedInstance->GetLinkId());
+                        linkUpdate.Redo();
                     }
                 });
-
+                
                 // Create a link between the templates of the newly created instance and the instance it's being parented under.
                 CreateLink(
                     instanceToCreate->get(), commonRootEntityOwningInstance->get().GetTemplateId(), undoBatch.GetUndoBatch(),
                     AZStd::move(patch));
 
-                for (AZ::Entity* topLevelEntity : topLevelEntities)
-                {
-                    AZ::EntityId topLevelEntityId = topLevelEntity->GetId();
-                    if (topLevelEntityId.IsValid())
-                    {
-                        m_prefabUndoCache.UpdateCache(topLevelEntity->GetId());
-
-                        // Parenting entities would mark entities as dirty. But we want to unmark the top level entities as dirty because
-                        // if we don't, the template created would be updated and cause issues with undo operation followed by instantiation.
-                        ToolsApplicationRequests::Bus::Broadcast(
-                            &ToolsApplicationRequests::Bus::Events::RemoveDirtyEntity, topLevelEntity->GetId());
-                    }
-                }
+                // This clears any entities marked as dirty due to reparenting of entities during the process of creating a prefab.
+                // We are doing this so that the changes in those enities are not queued up twice for propagation.
+                AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                    &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
                 
                 // Select Container Entity
                 {
@@ -824,15 +835,7 @@ namespace AzToolsFramework
                     // This will cover both cases where an alias could be used in a normal entity vs. an instance
                     for (auto aliasMapIter : oldAliasToNewAliasMap)
                     {
-                        QString oldAliasQuotes = QString("\"%1\"").arg(aliasMapIter.first.c_str());
-                        QString newAliasQuotes = QString("\"%1\"").arg(aliasMapIter.second.c_str());
-
-                        newEntityDomString.replace(oldAliasQuotes, newAliasQuotes);
-
-                        QString oldAliasPathRef = QString("/%1").arg(aliasMapIter.first.c_str());
-                        QString newAliasPathRef = QString("/%1").arg(aliasMapIter.second.c_str());
-
-                        newEntityDomString.replace(oldAliasPathRef, newAliasPathRef);
+                        ReplaceOldAliases(newEntityDomString, aliasMapIter.first, aliasMapIter.second);
                     }
 
                     // Create the new Entity DOM from parsing the JSON string
@@ -1233,5 +1236,18 @@ namespace AzToolsFramework
 
             return true;
         }
+
+        void PrefabPublicHandler::ReplaceOldAliases(QString& stringToReplace, AZStd::string_view oldAlias, AZStd::string_view newAlias)
+        {
+            QString oldAliasQuotes = QString("\"%1\"").arg(oldAlias.data());
+            QString newAliasQuotes = QString("\"%1\"").arg(newAlias.data());
+
+            stringToReplace.replace(oldAliasQuotes, newAliasQuotes);
+
+            QString oldAliasPathRef = QString("/%1").arg(oldAlias.data());
+            QString newAliasPathRef = QString("/%1").arg(newAlias.data());
+
+            stringToReplace.replace(oldAliasPathRef, newAliasPathRef);
+        }
     } // namespace Prefab
 } // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
index 223a725c6c..7e2357dd44 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h
@@ -14,12 +14,15 @@
 
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/std/string/string_view.h>
 
 #include <AzToolsFramework/Prefab/Instance/Instance.h>
 #include <AzToolsFramework/Prefab/PrefabPublicInterface.h>
 #include <AzToolsFramework/Prefab/PrefabSystemComponentInterface.h>
 #include <AzToolsFramework/Prefab/PrefabUndoCache.h>
 
+class QString;
+
 namespace AzToolsFramework
 {
     using EntityList = AZStd::vector<AZ::Entity*>;
@@ -27,7 +30,6 @@ namespace AzToolsFramework
     namespace Prefab
     {
         class Instance;
-
         class InstanceEntityMapperInterface;
         class InstanceToTemplateInterface;
         class PrefabLoaderInterface;
@@ -130,6 +132,8 @@ namespace AzToolsFramework
             bool IsCyclicalDependencyFound(
                 InstanceOptionalConstReference instance, const AZStd::unordered_set<AZ::IO::Path>& templateSourcePaths);
 
+            void ReplaceOldAliases(QString& stringToReplace, AZStd::string_view oldAlias, AZStd::string_view newAlias);
+
             static Instance* GetParentInstance(Instance* instance);
             static Instance* GetAncestorOfInstanceThatIsChildOfRoot(const Instance* ancestor, Instance* descendant);
             static void GenerateContainerEntityTransform(const EntityList& topLevelEntities, AZ::Vector3& translation, AZ::Quaternion& rotation);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
index 6950717499..0ca5853adc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.h
@@ -1,22 +1,22 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
-#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
-#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
-#include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
+#include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
 
 namespace AzToolsFramework
 {
@@ -31,7 +31,7 @@ namespace AzToolsFramework
         To use the EditorComponentAdapter, 3 classes are required:
          - a class that implements the functions required for TController (see below)
          - a configuration struct/class which extends AZ::ComponentConfig
-         - A runtime component that will be generated by the editor comoinent on export
+         - A runtime component that will be generated by the editor component on export
 
          The concrete component extends the adapter and implements behavior which is unique to the component.
 
@@ -64,15 +64,15 @@ namespace AzToolsFramework
         the EditContext. TController can friend itself to the editor component to make this work if required.
     */
         template<typename TController, typename TRuntimeComponent, typename TConfiguration = AZ::ComponentConfig>
-        class EditorComponentAdapter
-            : public EditorComponentBase
+        class EditorComponentAdapter : public EditorComponentBase
         {
         public:
-
-            AZ_RTTI((EditorComponentAdapter, "{2F5A3669-FFE9-4CD7-B9E2-7FC8100CF1A2}", TController, TRuntimeComponent, TConfiguration), EditorComponentBase);
+            AZ_RTTI(
+                (EditorComponentAdapter, "{2F5A3669-FFE9-4CD7-B9E2-7FC8100CF1A2}", TController, TRuntimeComponent, TConfiguration),
+                EditorComponentBase);
 
             EditorComponentAdapter() = default;
-            EditorComponentAdapter(const TConfiguration& configuration);
+            explicit EditorComponentAdapter(const TConfiguration& configuration);
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
@@ -86,7 +86,6 @@ namespace AzToolsFramework
             void BuildGameEntity(AZ::Entity* gameEntity) override;
 
         protected:
-
             static void Reflect(AZ::ReflectContext* context);
 
             // AZ::Component overrides ...
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
index 04619b079d..b8bd24589a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentAdapter.inl
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include <AzFramework/Components/ComponentAdapterHelpers.h>
 
@@ -28,23 +28,21 @@ namespace AzToolsFramework
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
         void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::Reflect(AZ::ReflectContext* context)
         {
-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
-                serializeContext->Class<EditorComponentAdapter, EditorComponentBase>()
-                    ->Version(1)
-                    ->Field("Controller", &EditorComponentAdapter::m_controller)
-                    ;
+                serializeContext->Class<EditorComponentAdapter, EditorComponentBase>()->Version(1)->Field(
+                    "Controller", &EditorComponentAdapter::m_controller);
 
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                 {
-                    editContext->Class<EditorComponentAdapter>(
-                        "EditorComponentAdapter", "")
+                    // clang-format off
+                    editContext->Class<EditorComponentAdapter>("EditorComponentAdapter", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->DataElement(AZ::Edit::UIHandlers::Default, &EditorComponentAdapter::m_controller, "Controller", "")
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
-                            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorComponentAdapter::OnConfigurationChanged)
-                        ;
+                            ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorComponentAdapter::OnConfigurationChanged);
+                    // clang-format on
                 }
             }
         }
@@ -53,27 +51,35 @@ namespace AzToolsFramework
         // Get*Services functions
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetProvidedServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            AzFramework::Components::GetProvidedServicesHelper<TController>(services, typename AZ::HasComponentProvidedServices<TController>::type());
+            AzFramework::Components::GetProvidedServicesHelper<TController>(
+                services, typename AZ::HasComponentProvidedServices<TController>::type());
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetRequiredServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            AzFramework::Components::GetRequiredServicesHelper<TController>(services, typename AZ::HasComponentRequiredServices<TController>::type());
+            AzFramework::Components::GetRequiredServicesHelper<TController>(
+                services, typename AZ::HasComponentRequiredServices<TController>::type());
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetIncompatibleServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            AzFramework::Components::GetIncompatibleServicesHelper<TController>(services, typename AZ::HasComponentIncompatibleServices<TController>::type());
+            AzFramework::Components::GetIncompatibleServicesHelper<TController>(
+                services, typename AZ::HasComponentIncompatibleServices<TController>::type());
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+        void EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::GetDependentServices(
+            AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            AzFramework::Components::GetDependentServicesHelper<TController>(services, typename AZ::HasComponentDependentServices<TController>::type());
+            AzFramework::Components::GetDependentServicesHelper<TController>(
+                services, typename AZ::HasComponentDependentServices<TController>::type());
         }
 
         //////////////////////////////////////////////////////////////////////////
@@ -99,7 +105,8 @@ namespace AzToolsFramework
 
             if (ShouldActivateController())
             {
-                m_controller.Activate(GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
             }
         }
 
@@ -122,7 +129,8 @@ namespace AzToolsFramework
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        bool EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::WriteOutConfig(AZ::ComponentConfig* outBaseConfig) const
+        bool EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>::WriteOutConfig(
+            AZ::ComponentConfig* outBaseConfig) const
         {
             if (auto config = azrtti_cast<TConfiguration*>(outBaseConfig))
             {
@@ -139,7 +147,8 @@ namespace AzToolsFramework
 
             if (ShouldActivateController())
             {
-                m_controller.Activate(GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    m_controller, AZ::EntityComponentIdPair(GetEntityId(), GetId()));
             }
 
             return AZ::Edit::PropertyRefreshLevels::None;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
index 48a7a37487..c46bb158c6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp
@@ -17,6 +17,7 @@
 #include <AzCore/Asset/AssetManagerBus.h>
 
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+#include <AzToolsFramework/API/EditorViewportIconDisplayInterface.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/ToolsComponents/EditorVisibilityBus.h>
 #include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
@@ -313,8 +314,7 @@ namespace AzToolsFramework
             // if we do not yet have a valid texture id, request it using the entity icon path
             if (m_entityIconTextureId == 0)
             {
-                EditorRequestBus::BroadcastResult(
-                    m_entityIconTextureId, &EditorRequests::GetIconTextureIdFromEntityIconPath, m_entityIconPath);
+                m_entityIconTextureId = EditorViewportIconDisplay::Get()->GetOrLoadIconForPath(m_entityIconPath);
             }
 
             return m_entityIconTextureId;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
index b73978c792..285d962b46 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp
@@ -520,91 +520,13 @@ namespace AzToolsFramework
             return m_editorTransform.m_translate.GetZ();
         }
 
-        void TransformComponent::SetRotation(const AZ::Vector3& eulerAnglesRadians)
+        void TransformComponent::SetWorldRotationQuaternion(const AZ::Quaternion& quaternion)
         {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "SetRotation is deprecated, please use SetLocalRotation");
-            AZ::Transform newWorldTransform = GetWorldTM();
-            newWorldTransform.SetRotation(AZ::ConvertEulerRadiansToQuaternion(eulerAnglesRadians));
-            SetWorldTM(newWorldTransform);
-        }
-
-        void TransformComponent::SetRotationQuaternion(const AZ::Quaternion& quaternion)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "SetRotationQuaternion is deprecated, please use SetLocalRotation");
             AZ::Transform newWorldTransform = GetWorldTM();
             newWorldTransform.SetRotation(quaternion);
             SetWorldTM(newWorldTransform);
         }
 
-        void TransformComponent::SetRotationX(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "SetRotationX is deprecated, please use SetLocalRotation");
-            AZ::Transform newWorldTransform = GetWorldTM();
-            newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationX(eulerAngleRadians));
-            SetWorldTM(newWorldTransform);
-        }
-
-        void TransformComponent::SetRotationY(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "SetRotationY is deprecated, please use SetLocalRotation");
-            AZ::Transform newWorldTransform = GetWorldTM();
-            newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationY(eulerAngleRadians));
-            SetWorldTM(newWorldTransform);
-        }
-
-        void TransformComponent::SetRotationZ(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "SetRotationZ is deprecated, please use SetLocalRotation");
-            AZ::Transform newWorldTransform = GetWorldTM();
-            newWorldTransform.SetRotation(AZ::Quaternion::CreateRotationZ(eulerAngleRadians));
-            SetWorldTM(newWorldTransform);
-        }
-
-        void TransformComponent::RotateByX(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "RotateByX is deprecated, please use RotateAroundLocalX");
-            SetWorldTM(GetWorldTM() * AZ::Transform::CreateRotationX(eulerAngleRadians));
-        }
-
-        void TransformComponent::RotateByY(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "RotateByY is deprecated, please use RotateAroundLocalY");
-            SetWorldTM(GetWorldTM() * AZ::Transform::CreateRotationY(eulerAngleRadians));
-        }
-
-        void TransformComponent::RotateByZ(float eulerAngleRadians)
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "RotateByZ is deprecated, please use RotateAroundLocalZ");
-            SetWorldTM(GetWorldTM() * AZ::Transform::CreateRotationZ(eulerAngleRadians));
-        }
-
-        AZ::Vector3 TransformComponent::GetRotationEulerRadians()
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "GetRotationEulerRadians is deprecated, please use GetWorldRotation");
-            return GetWorldTM().GetRotation().GetEulerRadians();
-        }
-
-        AZ::Quaternion TransformComponent::GetRotationQuaternion()
-        {
-            AZ_Warning("AzToolsFramework::TransformComponent", false, "GetRotationQuaternion is deprecated, please use GetWorldRotationQuaternion");
-            return GetWorldTM().GetRotation();
-        }
-
-        float TransformComponent::GetRotationX()
-        {
-            return GetRotationEulerRadians().GetX();
-        }
-
-        float TransformComponent::GetRotationY()
-        {
-            return GetRotationEulerRadians().GetY();
-        }
-
-        float TransformComponent::GetRotationZ()
-        {
-            return GetRotationEulerRadians().GetZ();
-        }
-
         AZ::Vector3 TransformComponent::GetWorldRotation()
         {
             return GetWorldTM().GetRotation().GetEulerRadians();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
index 91d64b0533..f772b608c1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.h
@@ -99,22 +99,7 @@ namespace AzToolsFramework
             float GetLocalZ() override;
 
             // Rotation modifiers
-            void SetRotation(const AZ::Vector3& eulerAnglesRadians) override;
-            void SetRotationQuaternion(const AZ::Quaternion& quaternion) override;
-            void SetRotationX(float eulerAngleRadians) override;
-            void SetRotationY(float eulerAngleRadians) override;
-            void SetRotationZ(float eulerAngleRadians) override;
-
-            void RotateByX(float eulerAngleRadians) override;
-            void RotateByY(float eulerAngleRadians) override;
-            void RotateByZ(float eulerAngleRadians) override;
-
-            AZ::Vector3 GetRotationEulerRadians() override;
-            AZ::Quaternion GetRotationQuaternion() override;
-
-            float GetRotationX() override;
-            float GetRotationY() override;
-            float GetRotationZ() override;
+            void SetWorldRotationQuaternion(const AZ::Quaternion& quaternion) override;
 
             AZ::Vector3 GetWorldRotation() override;
             AZ::Quaternion GetWorldRotationQuaternion() override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
index 8e91dc945d..91eee18cb7 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
@@ -165,15 +165,18 @@ namespace AzToolsFramework
             virtual bool AngleSnappingEnabled() = 0;
             /// Return the angle snapping/step size.
             virtual float AngleStep() = 0;
-            /// Transform a point in world space to screen space coordinates.
+            /// Transform a point in world space to screen space coordinates in Qt Widget space.
+            /// Multiply by DeviceScalingFactor to get the position in viewport pixel space.
             virtual AzFramework::ScreenPoint ViewportWorldToScreen(const AZ::Vector3& worldPosition) = 0;
-            /// Transform a point in screen space coordinates to a vector in world space based on clip space depth.
+            /// Transform a point from Qt widget screen space to world space based on the given clip space depth.
             /// Depth specifies a relative camera depth to project in the range of [0.f, 1.f].
             /// Returns the world space position if successful.
             virtual AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) = 0;
             /// Casts a point in screen space to a ray in world space originating from the viewport camera frustum's near plane.
             /// Returns a ray containing the ray's origin and a direction normal, if successful.
             virtual AZStd::optional<ProjectedViewportRay> ViewportScreenToWorldRay(const AzFramework::ScreenPoint& screenPosition) = 0;
+            /// Gets the DPI scaling factor that translates Qt widget space into viewport pixel space.
+            virtual float DeviceScalingFactor() = 0;
 
         protected:
             ~ViewportInteractionRequests() = default;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index 5c62a2997b..31da01fadc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -21,6 +21,7 @@
 #include <AzToolsFramework/Viewport/ViewportTypes.h>
 #include <AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h>
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+#include <AzToolsFramework/API/EditorViewportIconDisplayInterface.h>
 
 AZ_CVAR(
     bool, ed_visibility_showAggregateEntitySelectionBounds, false, nullptr, AZ::ConsoleFunctorFlags::Null,
@@ -232,10 +233,14 @@ namespace AzToolsFramework
                     return AZ::Color(1.0f, 1.0f, 1.0f, 1.0f);
                 }();
 
-                debugDisplay.SetColor(iconHighlight);
-                // debugDisplay.DrawTextureLabel(
-                //     iconTextureId, entityPosition, iconSize, iconSize,
-                //     /*DisplayContext::ETextureIconFlags::TEXICON_ON_TOP=*/ 0x0008);
+                EditorViewportIconDisplay::Get()->DrawIcon({
+                    viewportInfo.m_viewportId,
+                    iconTextureId,
+                    iconHighlight,
+                    entityPosition,
+                    EditorViewportIconDisplayInterface::CoordinateSpace::WorldSpace,
+                    AZ::Vector2{iconSize, iconSize}
+                });
             }
         }
     }
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index 86744ab16d..3507f532b5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -435,7 +435,7 @@ namespace AzToolsFramework
         }
     }
 
-    static void DestroyTransformModeSelectionCluster(const ViewportUi::ClusterId clusterId)
+    static void DestroyCluster(const ViewportUi::ClusterId clusterId)
     {
         ViewportUi::ViewportUiRequestBus::Event(
             ViewportUi::DefaultViewportId,
@@ -483,6 +483,26 @@ namespace AzToolsFramework
         return worldFromLocal.TransformPoint(CalculateCenterOffset(entityId, pivot));
     }
 
+    void EditorTransformComponentSelection::UpdateSpaceCluster(const ReferenceFrame referenceFrame)
+    {
+        auto buttonIdFromFrameFn = [this](const ReferenceFrame referenceFrame) {         
+            switch (referenceFrame)
+            {
+            case ReferenceFrame::Local:
+                return m_spaceCluster.m_localButtonId;
+            case ReferenceFrame::Parent:
+                return m_spaceCluster.m_parentButtonId;
+            case ReferenceFrame::World:
+                return m_spaceCluster.m_worldButtonId;
+            }
+            return m_spaceCluster.m_parentButtonId;
+        };
+
+        ViewportUi::ViewportUiRequestBus::Event(
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::SetClusterActiveButton, m_spaceCluster.m_spaceClusterId,
+            buttonIdFromFrameFn(referenceFrame));
+    }
+
     namespace ETCS
     {
         PivotOrientationResult CalculatePivotOrientation(
@@ -789,14 +809,12 @@ namespace AzToolsFramework
         EntityIdManipulators& entityIdManipulators,
         OptionalFrame& pivotOverrideFrame,
         ViewportInteraction::KeyboardModifiers& prevModifiers,
-        bool& transformChangedInternally)
+        bool& transformChangedInternally, const AZStd::optional<ReferenceFrame> spaceLock)
     {
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
 
         entityIdManipulators.m_manipulators->SetLocalPosition(action.LocalPosition());
 
-        const ReferenceFrame referenceFrame = ReferenceFrameFromModifiers(action.m_modifiers);
-
         if (action.m_modifiers.Ctrl())
         {
             // moving with ctrl - setting override
@@ -806,6 +824,8 @@ namespace AzToolsFramework
         }
         else
         {
+            const ReferenceFrame referenceFrame = spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
+
             // note: used for parent and world depending on the current reference frame
             const auto pivotOrientation =
                 ETCS::CalculateSelectionPivotOrientation(
@@ -1027,6 +1047,7 @@ namespace AzToolsFramework
         EditorManipulatorCommandUndoRedoRequestBus::Handler::BusConnect(entityContextId);
 
         CreateTransformModeSelectionCluster();
+        CreateSpaceSelectionCluster();
         RegisterActions();
         SetupBoxSelect();
         RefreshSelectedEntityIdsAndRegenerateManipulators();
@@ -1037,7 +1058,9 @@ namespace AzToolsFramework
         m_selectedEntityIds.clear();
         DestroyManipulators(m_entityIdManipulators);
 
-        DestroyTransformModeSelectionCluster(m_transformModeClusterId);
+        DestroyCluster(m_transformModeClusterId);
+        DestroyCluster(m_spaceCluster.m_spaceClusterId);
+
         UnregisterActions();
 
         m_pivotOverrideFrame.Reset();
@@ -1274,8 +1297,8 @@ namespace AzToolsFramework
             [this, prevModifiers, manipulatorEntityIds](const LinearManipulator::Action& action) mutable -> void
         {
             UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators,
-                m_pivotOverrideFrame, prevModifiers, m_transformChangedInternally);
+                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+                    m_transformChangedInternally, m_spaceCluster.m_spaceLock);
         });
 
         translationManipulators->InstallLinearManipulatorMouseUpCallback(
@@ -1305,8 +1328,8 @@ namespace AzToolsFramework
             [this, prevModifiers, manipulatorEntityIds](const PlanarManipulator::Action& action) mutable -> void
         {
             UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators,
-                m_pivotOverrideFrame, prevModifiers, m_transformChangedInternally);
+                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+                    m_transformChangedInternally, m_spaceCluster.m_spaceLock);
         });
 
         translationManipulators->InstallPlanarManipulatorMouseUpCallback(
@@ -1335,8 +1358,8 @@ namespace AzToolsFramework
             [this, prevModifiers, manipulatorEntityIds](const SurfaceManipulator::Action& action) mutable -> void
         {
             UpdateTranslationManipulator(
-                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators,
-                m_pivotOverrideFrame, prevModifiers, m_transformChangedInternally);
+                action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
+                    m_transformChangedInternally, m_spaceCluster.m_spaceLock);
         });
 
         translationManipulators->InstallSurfaceManipulatorMouseUpCallback(
@@ -1414,8 +1437,7 @@ namespace AzToolsFramework
             [this, prevModifiers, sharedRotationState]
             (const AngularManipulator::Action& action) mutable -> void
         {
-            const ReferenceFrame referenceFrame = ReferenceFrameFromModifiers(action.m_modifiers);
-
+            const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
             const AZ::Quaternion manipulatorOrientation = action.m_start.m_rotation * action.m_current.m_delta;
             // store the pivot override frame when positioning the manipulator manually (ctrl)
             // so we don't lose the orientation when adding/removing entities from the selection
@@ -2566,6 +2588,64 @@ namespace AzToolsFramework
             m_transformModeSelectionHandler);
     }
 
+    void EditorTransformComponentSelection::CreateSpaceSelectionCluster()
+    {
+        // create the cluster for switching spaces/reference frames
+        ViewportUi::ViewportUiRequestBus::EventResult(
+            m_spaceCluster.m_spaceClusterId, ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::CreateCluster,
+            ViewportUi::Alignment::TopRight);
+
+        // create and register the buttons (strings correspond to icons even if the values appear different)
+        m_spaceCluster.m_worldButtonId = RegisterClusterButton(m_spaceCluster.m_spaceClusterId, "World");
+        m_spaceCluster.m_parentButtonId = RegisterClusterButton(m_spaceCluster.m_spaceClusterId, "Parent");
+        m_spaceCluster.m_localButtonId = RegisterClusterButton(m_spaceCluster.m_spaceClusterId, "Local");
+
+        auto onButtonClicked = [this](ViewportUi::ButtonId buttonId) {
+            if (buttonId == m_spaceCluster.m_localButtonId)
+            {
+                // Unlock
+                if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::Local)
+                {
+                    m_spaceCluster.m_spaceLock = AZStd::nullopt;
+                }
+                else
+                {
+                    m_spaceCluster.m_spaceLock = ReferenceFrame::Local;
+                }
+            }
+            else if (buttonId == m_spaceCluster.m_parentButtonId)
+            {
+                // Unlock
+                if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::Parent)
+                {
+                    m_spaceCluster.m_spaceLock = AZStd::nullopt;
+                }
+                else
+                {
+                    m_spaceCluster.m_spaceLock = ReferenceFrame::Parent;
+                }
+            }
+            else if (buttonId == m_spaceCluster.m_worldButtonId)
+            {
+                // Unlock
+                if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::World)
+                {
+                    m_spaceCluster.m_spaceLock = AZStd::nullopt;
+                }
+                else
+                {
+                    m_spaceCluster.m_spaceLock = ReferenceFrame::World;
+                }
+            }
+        };
+
+        m_spaceCluster.m_spaceSelectionHandler = AZ::Event<ViewportUi::ButtonId>::Handler(onButtonClicked);
+
+        ViewportUi::ViewportUiRequestBus::Event(
+            ViewportUi::DefaultViewportId, &ViewportUi::ViewportUiRequestBus::Events::RegisterClusterEventHandler,
+            m_spaceCluster.m_spaceClusterId, m_spaceCluster.m_spaceSelectionHandler);
+    }
+
     EditorTransformComponentSelectionRequests::Mode EditorTransformComponentSelection::GetTransformMode()
     {
         return m_mode;
@@ -2963,7 +3043,7 @@ namespace AzToolsFramework
             if (transformIt != transformsBefore.end())
             {
                 AZ::Transform transformBefore = transformIt->second;
-                transformBefore.ExtractScale();
+                transformBefore.ExtractUniformScale();
                 AZ::Transform newWorldFromLocal = transformBefore * scaleTransform;
 
                 SetEntityWorldTransform(entityId, newWorldFromLocal);
@@ -3277,7 +3357,9 @@ namespace AzToolsFramework
             ViewportInteraction::BuildMouseButtons(
                 QGuiApplication::mouseButtons()), m_boxSelect.Active());
 
-        const ReferenceFrame referenceFrame = ReferenceFrameFromModifiers(modifiers);
+        const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(modifiers));
+
+        UpdateSpaceCluster(referenceFrame);
 
         bool refresh = false;
         if (referenceFrame != m_referenceFrame)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
index 500ae484f8..2bc4d7cbf6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
@@ -106,6 +106,22 @@ namespace AzToolsFramework
         World, //!< World space (space aligned to world axes - identity).
     };
 
+    //! Grouping of viewport ui related state for controlling the current reference space of the Editor.
+    struct SpaceCluster
+    {
+        SpaceCluster() = default;
+        // disable copying and moving (implicit)
+        SpaceCluster(const SpaceCluster&) = delete;
+        SpaceCluster& operator=(const SpaceCluster&) = delete;
+
+        ViewportUi::ClusterId m_spaceClusterId; //!< The id identifying the reference space cluster.
+        ViewportUi::ButtonId m_localButtonId; //!< Local reference space button id.
+        ViewportUi::ButtonId m_parentButtonId; //!< Parent reference space button id.
+        ViewportUi::ButtonId m_worldButtonId; //!< World reference space button id.
+        AZ::Event<ViewportUi::ButtonId>::Handler m_spaceSelectionHandler; //!< Callback for when a space cluster button is pressed.
+        AZStd::optional<ReferenceFrame> m_spaceLock; //!< Locked reference frame to use if set.
+    };
+
     //! Entity selection/interaction handling.
     //! Provide a suite of functionality for manipulating entities, primarily through their TransformComponent.
     class EditorTransformComponentSelection
@@ -160,6 +176,7 @@ namespace AzToolsFramework
         void RegenerateManipulators();
 
         void CreateTransformModeSelectionCluster();
+        void CreateSpaceSelectionCluster();
 
         void ClearManipulatorTranslationOverride();
         void ClearManipulatorOrientationOverride();
@@ -253,6 +270,9 @@ namespace AzToolsFramework
         void SetEntityLocalScale(AZ::EntityId entityId, float localScale);
         void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation);
 
+        // Responsible for keeping the space cluster in sync with the current reference frame.
+        void UpdateSpaceCluster(ReferenceFrame referenceFrame);
+
         AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
         AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
         AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.
@@ -285,6 +305,7 @@ namespace AzToolsFramework
         AZ::Event<ViewportUi::ButtonId>::Handler m_transformModeSelectionHandler; //!< Event handler for the Viewport UI cluster.
         AzFramework::ClickDetector m_clickDetector; //!< Detect different types of mouse click.
         AzFramework::CursorState m_cursorState; //!< Track the mouse position and delta movement each frame.
+        SpaceCluster m_spaceCluster; //!< Related viewport ui state for controlling the current reference space.
     };
 
     //! The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
index 45f52704bf..aaf5c86d33 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake
@@ -46,6 +46,7 @@ set(FILES
     API/EditorWindowRequestBus.h
     API/EntityCompositionRequestBus.h
     API/EntityCompositionNotificationBus.h
+    API/EditorViewportIconDisplayInterface.h
     API/ViewPaneOptions.h
     Application/Ticker.h
     Application/Ticker.cpp
diff --git a/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
index 5ccbd95f09..33009bc0da 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp
@@ -15,6 +15,7 @@
 #include <AzToolsFramework/Asset/AssetSeedManager.h>
 #include <AzFramework/Asset/AssetRegistry.h>
 #include <AzCore/IO/FileIO.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #include <AzFramework/Asset/AssetCatalog.h>
 #include <AzFramework/StringFunc/StringFunc.h>
@@ -62,6 +63,12 @@ namespace UnitTest
             m_assetSeedManager = new AzToolsFramework::AssetSeedManager();
             m_assetRegistry = new AzFramework::AssetRegistry();
 
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_application->Start(AzFramework::Application::Descriptor());
 
             for (int idx = 0; idx < s_totalAssets; idx++)
@@ -75,7 +82,7 @@ namespace UnitTest
             }
 
             m_testPlatforms[0] = AzFramework::PlatformId::PC;
-            m_testPlatforms[1] = AzFramework::PlatformId::ES3;
+            m_testPlatforms[1] = AzFramework::PlatformId::ANDROID_ID;
 
             int platformCount = 0;
             for(auto thisPlatform : m_testPlatforms)
@@ -163,20 +170,20 @@ namespace UnitTest
             AzFramework::AssetCatalog assetCatalog(useRequestBus);
 
             AZStd::string pcCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::PC);
-            AZStd::string es3CatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
+            AZStd::string androidCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
 
             if (!assetCatalog.SaveCatalog(pcCatalogFile.c_str(), m_assetRegistry))
             {
                 GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (PC) file.\n").c_str());
             }
 
-            if (!assetCatalog.SaveCatalog(es3CatalogFile.c_str(), m_assetRegistry))
+            if (!assetCatalog.SaveCatalog(androidCatalogFile.c_str(), m_assetRegistry))
             {
-                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (ES3) file.\n").c_str());
+                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (ANDROID) file.\n").c_str());
             }
 
             m_pcCatalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::PC);
-            m_es3Catalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::ES3);
+            m_androidCatalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::ANDROID_ID);
 
             const AZStd::string engroot = AZ::Test::GetEngineRootPath();
             AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engroot.c_str());
@@ -220,21 +227,21 @@ namespace UnitTest
             }
 
             auto pcCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::PC);
-            auto es3CatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
+            auto androidCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
             if (fileIO->Exists(pcCatalogFile.c_str()))
             {
                 fileIO->Remove(pcCatalogFile.c_str());
             }
 
-            if (fileIO->Exists(es3CatalogFile.c_str()))
+            if (fileIO->Exists(androidCatalogFile.c_str()))
             {
-                fileIO->Remove(es3CatalogFile.c_str());
+                fileIO->Remove(androidCatalogFile.c_str());
             }
 
             delete m_assetSeedManager;
             delete m_assetRegistry;
             delete m_pcCatalog;
-            delete m_es3Catalog;
+            delete m_androidCatalog;
             m_application->Stop();
             delete m_application;
         }
@@ -335,10 +342,10 @@ namespace UnitTest
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
 
             // Step we are testing
-            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
-            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
             {
                 EXPECT_EQ(seedInfo.m_platformFlags, expectedPlatformFlags);
@@ -351,14 +358,14 @@ namespace UnitTest
             m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC);
             m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_PC);
 
-            m_es3Catalog->UnregisterAsset(assets[2]);
+            m_androidCatalog->UnregisterAsset(assets[2]);
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
 
             // Step we are testing
-            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
-            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
             {
                 if (seedInfo.m_assetId == assets[2])
@@ -376,14 +383,14 @@ namespace UnitTest
         {
             // Setup
             m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_ANDROID);
             m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_ANDROID);
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_ANDROID);
 
             // Step we are testing
-            m_assetSeedManager->RemovePlatformFromAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->RemovePlatformFromAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
@@ -507,8 +514,8 @@ namespace UnitTest
 
         void DependencyValidation_MultipleAssetSeeds_MultiplePlatformFlags_ListValid()
         {
-            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
-            m_assetSeedManager->AddSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
+            m_assetSeedManager->AddSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             AzToolsFramework::AssetFileInfoList assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -524,7 +531,7 @@ namespace UnitTest
 
             assetList.m_fileInfoList.clear();
 
-            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -540,7 +547,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[8]));
 
             assetList.m_fileInfoList.clear();
-            m_assetSeedManager->RemoveSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->RemoveSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -555,7 +562,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[8]));
 
             // Removing the android flag from the asset should still produce the same result 
-            m_assetSeedManager->RemoveSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->RemoveSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -569,7 +576,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[7]));
             EXPECT_TRUE(Search(assetList, assets[8]));
 
-            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ES3);
+            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ANDROID_ID);
 
             EXPECT_EQ(assetList.m_fileInfoList.size(), 5);
             EXPECT_TRUE(Search(assetList, assets[0]));
@@ -579,8 +586,8 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[4]));
 
             // Adding the android flag again to the asset 
-            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ES3);
-            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ANDROID);
+            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ANDROID_ID);
 
             EXPECT_EQ(assetList.m_fileInfoList.size(), 8);
             EXPECT_TRUE(Search(assetList, assets[0]));
@@ -766,7 +773,7 @@ namespace UnitTest
         AzFramework::AssetRegistry* m_assetRegistry;
         ToolsTestApplication* m_application;
         AzToolsFramework::PlatformAddressedAssetCatalog* m_pcCatalog;
-        AzToolsFramework::PlatformAddressedAssetCatalog* m_es3Catalog;
+        AzToolsFramework::PlatformAddressedAssetCatalog* m_androidCatalog;
         AZ::IO::FileIOStream m_fileStreams[s_totalTestPlatforms][s_totalAssets];
         AzFramework::PlatformId m_testPlatforms[s_totalTestPlatforms];
         AZStd::string m_assetsPath[s_totalAssets];
@@ -929,7 +936,7 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_AllPlatformsValid_SeedAddedForEveryInputPlatform)
     {
         using namespace AzFramework;
-        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ES3;
+        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ANDROID;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, validPlatforms);
 
         // Verify the function outputs
@@ -946,8 +953,8 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_SomePlatformsValid_SeedAddedForEveryValidPlatform)
     {
         using namespace AzFramework;
-        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ES3;
-        PlatformFlags inputPlatforms = validPlatforms | PlatformFlags::Platform_OSX;
+        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ANDROID;
+        PlatformFlags inputPlatforms = validPlatforms | PlatformFlags::Platform_MAC;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, inputPlatforms);
 
         // Verify the function outputs
@@ -964,7 +971,7 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_NoPlatformsValid_NoSeedAdded)
     {
         using namespace AzFramework;
-        PlatformFlags inputPlatforms = PlatformFlags::Platform_OSX;
+        PlatformFlags inputPlatforms = PlatformFlags::Platform_MAC;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, inputPlatforms);
 
         // Verify the function outputs
@@ -978,30 +985,30 @@ namespace UnitTest
 
     TEST_F(AssetSeedManagerTest, Valid_Seed_Remove_ForAllPlatform_OK)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 0);
 
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
         EXPECT_EQ(secondSeedList.size(), 0);
     }
 
     TEST_F(AssetSeedManagerTest, Valid_Seed_Remove_ForSpecificPlatform_OK)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 1);
 
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
         m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
@@ -1010,14 +1017,14 @@ namespace UnitTest
 
     TEST_F(AssetSeedManagerTest, Invalid_NotRemove_SeedForAllPlatform_Ok)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[1].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[1].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 1);
 
-        m_assetSeedManager->RemoveSeedAsset("asset1.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset("asset1.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
         EXPECT_EQ(secondSeedList.size(), 1);
     }
diff --git a/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h b/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
index 1e01229d73..8a394d3ab5 100644
--- a/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
+++ b/Code/Framework/AzToolsFramework/Tests/AssetSystemMocks.h
@@ -25,6 +25,8 @@ namespace UnitTests
         MOCK_METHOD0(GetAbsoluteDevGameFolderPath, const char* ());
         MOCK_METHOD0(GetAbsoluteDevRootFolderPath, const char* ());
         MOCK_METHOD2(GetRelativeProductPathFromFullSourceOrProductPath, bool(const AZStd::string& fullPath, AZStd::string& relativeProductPath));
+        MOCK_METHOD3(GenerateRelativeSourcePath,
+            bool(const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& watchFolder));
         MOCK_METHOD2(GetFullSourcePathFromRelativeProductPath, bool(const AZStd::string& relPath, AZStd::string& fullSourcePath));
         MOCK_METHOD5(GetAssetInfoById, bool(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType& assetType, const AZStd::string& platformName, AZ::Data::AssetInfo& assetInfo, AZStd::string& rootFilePath));
         MOCK_METHOD3(GetSourceInfoBySourcePath, bool(const char* sourcePath, AZ::Data::AssetInfo& assetInfo, AZStd::string& watchFolder));
diff --git a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
index 328bf5dea5..0b705338d9 100644
--- a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp
@@ -10,6 +10,8 @@
 *
 */
 
+#include <AzCore/Settings/SettingsRegistryImpl.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/AssetCatalog/PlatformAddressedAssetCatalogManager.h>
 #include <AzFramework/Asset/AssetRegistry.h>
@@ -49,6 +51,14 @@ namespace UnitTest
             using namespace AZ::Data;
             m_application = new ToolsTestApplication("AddressedAssetCatalogManager"); // Shorter name because Setting Registry
                                                                                       // specialization are 32 characters max.
+
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_application->Start(AzFramework::Application::Descriptor());
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
@@ -174,13 +184,13 @@ namespace UnitTest
     TEST_F(PlatformAddressedAssetCatalogManagerTest, PlatformAddressedAssetCatalogManager_CatalogExistsChecks_Success)
     {
 
-        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ES3), true);
-        AZStd::string es3CatalogPath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
-        if (AZ::IO::FileIOBase::GetInstance()->Exists(es3CatalogPath.c_str()))
+        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ANDROID_ID), true);
+        AZStd::string androidCatalogPath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(androidCatalogPath.c_str()))
         {
-            AZ::IO::FileIOBase::GetInstance()->Remove(es3CatalogPath.c_str());
+            AZ::IO::FileIOBase::GetInstance()->Remove(androidCatalogPath.c_str());
         }
-        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ES3), false);
+        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ANDROID_ID), false);
     }
 
     class PlatformAddressedAssetCatalogMessageTest : public AzToolsFramework::PlatformAddressedAssetCatalog
@@ -241,7 +251,7 @@ namespace UnitTest
         AzFramework::AssetSystem::NetworkAssetUpdateInterface* notificationInterface = AZ::Interface<AzFramework::AssetSystem::NetworkAssetUpdateInterface>::Get();
         EXPECT_NE(notificationInterface, nullptr);
 
-        auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ES3);
+        auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ANDROID_ID);
         AZStd::unique_ptr< ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>> catalogHolder;
         catalogHolder.reset(mockCatalog);
 
@@ -249,7 +259,7 @@ namespace UnitTest
         EXPECT_CALL(*mockCatalog, AssetChanged(testing::_)).Times(0);
         notificationInterface->AssetChanged(testMessage);
 
-        testMessage.m_platform = "es3";
+        testMessage.m_platform = "android";
         EXPECT_CALL(*mockCatalog, AssetChanged(testing::_)).Times(1);
         notificationInterface->AssetChanged(testMessage);
 
@@ -260,7 +270,7 @@ namespace UnitTest
         EXPECT_CALL(*mockCatalog, AssetRemoved(testing::_)).Times(0);
         notificationInterface->AssetRemoved(testMessage);
 
-        testMessage.m_platform = "es3";
+        testMessage.m_platform = "android";
         EXPECT_CALL(*mockCatalog, AssetRemoved(testing::_)).Times(1);
         notificationInterface->AssetRemoved(testMessage);
     }
diff --git a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
index 57ac16673d..7d3d312cdb 100644
--- a/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
+++ b/Code/Framework/AzToolsFramework/Tests/SliceStabilityTests/SliceStabilityTestFramework.h
@@ -149,6 +149,9 @@ namespace UnitTest
         const char* GetAbsoluteDevGameFolderPath() override { return ""; }
         const char* GetAbsoluteDevRootFolderPath() override { return ""; }
         bool GetRelativeProductPathFromFullSourceOrProductPath([[maybe_unused]] const AZStd::string& fullPath, [[maybe_unused]] AZStd::string& relativeProductPath) override { return false; }
+        bool GenerateRelativeSourcePath(
+            [[maybe_unused]] const AZStd::string& sourcePath, [[maybe_unused]] AZStd::string& relativePath,
+            [[maybe_unused]] AZStd::string& watchFolder) override { return false; }
         bool GetFullSourcePathFromRelativeProductPath([[maybe_unused]] const AZStd::string& relPath, [[maybe_unused]] AZStd::string& fullSourcePath) override { return false; }
         bool GetAssetInfoById([[maybe_unused]] const AZ::Data::AssetId& assetId, [[maybe_unused]] const AZ::Data::AssetType& assetType, [[maybe_unused]] const AZStd::string& platformName, [[maybe_unused]] AZ::Data::AssetInfo& assetInfo, [[maybe_unused]] AZStd::string& rootFilePath) override { return false; }
         bool GetSourceInfoBySourcePath(const char* sourcePath, AZ::Data::AssetInfo& assetInfo, AZStd::string& watchFolder) override;
diff --git a/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
index 751e151ec6..1714ee5aa5 100644
--- a/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
+++ b/Code/Framework/GridMate/GridMate/Serialize/CompressionMarshal.cpp
@@ -488,18 +488,17 @@ void TransformCompressor::Marshal(WriteBuffer& wb, const AZ::Transform& value) c
 {
     AZ::u8 flags = 0;
     auto flagsMarker = wb.InsertMarker(flags);
-    AZ::Matrix3x3 m33 = AZ::Matrix3x3::CreateFromTransform(value);
-    AZ::Vector3 scale = m33.ExtractScale();
-    AZ::Quaternion rot = AZ::Quaternion::CreateFromMatrix3x3(m33.GetOrthogonalized());
+    float scale = value.GetUniformScale();
+    AZ::Quaternion rot = value.GetRotation();
     if (!rot.IsIdentity())
     {
         flags |= HAS_ROT;
         wb.Write(rot, QuatCompMarshaler());
     }
-    if (!scale.IsClose(AZ::Vector3::CreateOne()))
+    if (!AZ::IsClose(scale, 1.0f, AZ::Constants::Tolerance))
     {
         flags |= HAS_SCALE;
-        wb.Write(scale, Vec3CompMarshaler());
+        wb.Write(scale, HalfMarshaler());
     }
     AZ::Vector3 pos = value.GetTranslation();
     if (!pos.IsZero())
@@ -527,9 +526,9 @@ void TransformCompressor::Unmarshal(AZ::Transform& value, ReadBuffer& rb) const
     }
     if (flags & HAS_SCALE)
     {
-        AZ::Vector3 scale;
-        rb.Read(scale, Vec3CompMarshaler());
-        xform.MultiplyByScale(scale);
+        float scale;
+        rb.Read(scale, HalfMarshaler());
+        xform.MultiplyByUniformScale(scale);
     }
     if (flags & HAS_POS)
     {
diff --git a/Code/Framework/Tests/ArchiveCompressionTests.cpp b/Code/Framework/Tests/ArchiveCompressionTests.cpp
index fb6beca0b5..c648262599 100644
--- a/Code/Framework/Tests/ArchiveCompressionTests.cpp
+++ b/Code/Framework/Tests/ArchiveCompressionTests.cpp
@@ -11,6 +11,7 @@
 */
 
 #include <AzTest/AzTest.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UnitTest/UnitTest.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
@@ -40,6 +41,13 @@ namespace UnitTest
 
         void SetUp() override
         {
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_application->Start({});
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
diff --git a/Code/Framework/Tests/ArchiveTests.cpp b/Code/Framework/Tests/ArchiveTests.cpp
index aaca043c4b..6dc081ee72 100644
--- a/Code/Framework/Tests/ArchiveTests.cpp
+++ b/Code/Framework/Tests/ArchiveTests.cpp
@@ -16,6 +16,7 @@
 #include <AzCore/UnitTest/UnitTest.h>
 
 #include <AzCore/IO/SystemFile.h> // for max path decl
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/parallel/thread.h>
 #include <AzCore/std/parallel/semaphore.h>
 #include <AzCore/std/functional.h> // for function<> in the find files callback.
@@ -42,6 +43,14 @@ namespace UnitTest
         {
             AZ::ComponentApplication::Descriptor descriptor;
             descriptor.m_stackRecordLevels = 30;
+
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_application->Start(descriptor);
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
diff --git a/Code/Framework/Tests/AssetCatalog.cpp b/Code/Framework/Tests/AssetCatalog.cpp
index 8a89ba349c..1575b0a469 100644
--- a/Code/Framework/Tests/AssetCatalog.cpp
+++ b/Code/Framework/Tests/AssetCatalog.cpp
@@ -23,6 +23,7 @@
 #include <AzCore/Math/Uuid.h>
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/Memory/PoolAllocator.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
@@ -304,6 +305,13 @@ namespace UnitTest
             m_app.reset(aznew AzFramework::Application());
             AZ::ComponentApplication::Descriptor desc;
             desc.m_useExistingAllocator = true;
+            
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_app->Start(desc);
 
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Code/Framework/Tests/ComponentAddRemove.cpp b/Code/Framework/Tests/ComponentAddRemove.cpp
index 4fd6db7dde..f635a5ee3b 100644
--- a/Code/Framework/Tests/ComponentAddRemove.cpp
+++ b/Code/Framework/Tests/ComponentAddRemove.cpp
@@ -12,6 +12,7 @@
 
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzCore/Outcome/Outcome.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
@@ -572,6 +573,12 @@ namespace UnitTest
         {
             AllocatorsTestFixture::SetUp();
 
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             AzFramework::Application::Descriptor descriptor;
             descriptor.m_enableDrilling = false;
             m_app.Start(descriptor);
diff --git a/Code/Framework/Tests/FileFunc.cpp b/Code/Framework/Tests/FileFunc.cpp
index d703164582..8db77fd79b 100644
--- a/Code/Framework/Tests/FileFunc.cpp
+++ b/Code/Framework/Tests/FileFunc.cpp
@@ -17,6 +17,7 @@
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/Serialization/Json/JsonSystemComponent.h>
 #include <AzCore/Serialization/Json/RegistrationContext.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzFramework/FileFunc/FileFunc.h>
@@ -278,6 +279,12 @@ namespace UnitTest
         {
             FrameworkApplicationFixture::SetUp();
 
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_serializeContext = AZStd::make_unique<AZ::SerializeContext>();
             m_jsonRegistrationContext = AZStd::make_unique<AZ::JsonRegistrationContext>();
             m_jsonSystemComponent = AZStd::make_unique<AZ::JsonSystemComponent>();
diff --git a/Code/Framework/Tests/FileTagTests.cpp b/Code/Framework/Tests/FileTagTests.cpp
index 989c811111..b94131afee 100644
--- a/Code/Framework/Tests/FileTagTests.cpp
+++ b/Code/Framework/Tests/FileTagTests.cpp
@@ -83,6 +83,7 @@ namespace UnitTest
         void SetUp() override
         {
             AllocatorsFixture::SetUp();
+
             m_data = AZStd::make_unique<StaticData>();
             using namespace  AzFramework::FileTag;
             AZ::ComponentApplication::Descriptor desc;
diff --git a/Code/Framework/Tests/FrameworkApplicationFixture.h b/Code/Framework/Tests/FrameworkApplicationFixture.h
index f3a90864e7..c2fea389e0 100644
--- a/Code/Framework/Tests/FrameworkApplicationFixture.h
+++ b/Code/Framework/Tests/FrameworkApplicationFixture.h
@@ -54,7 +54,7 @@ namespace UnitTest
         };
 
         void SetUp() override
-        {
+        {            
             m_appDescriptor.m_allocationRecords = true;
             m_appDescriptor.m_allocationRecordsSaveNames = true;
             m_appDescriptor.m_recordingMode = AZ::Debug::AllocationRecords::Mode::RECORD_FULL;
diff --git a/Code/Framework/Tests/GenericComponentWrapperTest.cpp b/Code/Framework/Tests/GenericComponentWrapperTest.cpp
index b3dac90777..25af10b339 100644
--- a/Code/Framework/Tests/GenericComponentWrapperTest.cpp
+++ b/Code/Framework/Tests/GenericComponentWrapperTest.cpp
@@ -12,6 +12,7 @@
 #include <AzTest/AzTest.h>
 #include <AzCore/Slice/SliceComponent.h>
 #include <AzCore/Serialization/Utils.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzToolsFramework/ToolsComponents/GenericComponentWrapper.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
@@ -59,6 +60,12 @@ class WrappedEditorComponentTest
 protected:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         m_app.Start(AZ::ComponentApplication::Descriptor());
 
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
@@ -178,6 +185,12 @@ class FindWrappedComponentsTest
 public:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+        
         m_app.Start(AzFramework::Application::Descriptor());
 
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Code/Framework/Tests/PlatformHelper.cpp b/Code/Framework/Tests/PlatformHelper.cpp
index 1ad7794c58..9a23fb8d25 100644
--- a/Code/Framework/Tests/PlatformHelper.cpp
+++ b/Code/Framework/Tests/PlatformHelper.cpp
@@ -30,11 +30,11 @@ TEST_F(PlatformHelperTest, SinglePlatformFlags_PlatformId_Valid)
 
 TEST_F(PlatformHelperTest, MultiplePlatformFlags_PlatformId_Valid)
 {
-    AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+    AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
     auto platforms = AzFramework::PlatformHelper::GetPlatforms(platformFlags);
     EXPECT_EQ(platforms.size(), 2);
     EXPECT_EQ(platforms[0], "pc");
-    EXPECT_EQ(platforms[1], "es3");
+    EXPECT_EQ(platforms[1], "android");
 }
 
 TEST_F(PlatformHelperTest, SpecialAllFlag_PlatformId_Valid)
@@ -42,7 +42,7 @@ TEST_F(PlatformHelperTest, SpecialAllFlag_PlatformId_Valid)
     AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_ALL;
     auto platforms = AzFramework::PlatformHelper::GetPlatformsInterpreted(platformFlags);
     EXPECT_EQ(platforms.size(), AzFramework::NumPlatforms);
-    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "es3", "ios", "osx_gl", "provo", "salem", "jasper", "server"));
+    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "android", "ios", "mac", "provo", "salem", "jasper", "server"));
 }
 
 TEST_F(PlatformHelperTest, SpecialAllClientFlag_PlatformId_Valid)
@@ -50,7 +50,7 @@ TEST_F(PlatformHelperTest, SpecialAllClientFlag_PlatformId_Valid)
     AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_ALL_CLIENT;
     auto platforms = AzFramework::PlatformHelper::GetPlatformsInterpreted(platformFlags);
     EXPECT_EQ(platforms.size(), AzFramework::NumClientPlatforms);
-    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "es3", "ios", "osx_gl", "provo", "salem", "jasper"));
+    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "android", "ios", "mac", "provo", "salem", "jasper"));
 }
 
 TEST_F(PlatformHelperTest, InvalidPlatformFlags_PlatformId_Empty)
diff --git a/Code/Framework/Tests/Slices.cpp b/Code/Framework/Tests/Slices.cpp
index 6a9ce858c0..8a20c43fb5 100644
--- a/Code/Framework/Tests/Slices.cpp
+++ b/Code/Framework/Tests/Slices.cpp
@@ -22,6 +22,7 @@
 #include <AzCore/Slice/SliceAssetHandler.h>
 #include <AzCore/Script/ScriptSystemComponent.h>
 #include <AzCore/Script/ScriptAsset.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/chrono/chrono.h>
 #include <AzCore/RTTI/TypeInfo.h>
 #include <AzCore/UnitTest/TestTypes.h>
@@ -1059,6 +1060,12 @@ namespace UnitTest
 
         void SetUp() override
         {
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_app.Start(AzFramework::Application::Descriptor());
 
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp b/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
new file mode 100644
index 0000000000..1fa50fff52
--- /dev/null
+++ b/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
@@ -0,0 +1,158 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzFramework/Application/Application.h>
+#include <AzFramework/Spawnable/SpawnableAssetHandler.h>
+#include <AzFramework/Spawnable/SpawnableEntitiesManager.h>
+#include <AzTest/AzTest.h>
+
+namespace UnitTest
+{
+    class TestApplication : public AzFramework::Application
+    {
+    public:
+        // ComponentApplication
+        void SetSettingsRegistrySpecializations(AZ::SettingsRegistryInterface::Specializations& specializations) override
+        {
+            Application::SetSettingsRegistrySpecializations(specializations);
+            specializations.Append("test");
+            specializations.Append("spawnable");
+        }
+    };
+
+    class SpawnableEntitiesManagerTest : public AllocatorsFixture
+    {
+    public:
+        void SetUp() override
+        {
+            AllocatorsFixture::SetUp();
+
+            m_application = new TestApplication();
+            AZ::ComponentApplication::Descriptor descriptor;
+            m_application->Start(descriptor);
+            
+            m_spawnable = aznew AzFramework::Spawnable(
+                AZ::Data::AssetId::CreateString("{EB2E8A2B-F253-4A90-BBF4-55F2EED786B8}:0"), AZ::Data::AssetData::AssetStatus::Ready);
+            m_spawnableAsset = new AZ::Data::Asset<AzFramework::Spawnable>(m_spawnable, AZ::Data::AssetLoadBehavior::Default);
+            m_ticket = new AzFramework::EntitySpawnTicket(*m_spawnableAsset);
+
+            auto managerInterface = AzFramework::SpawnableEntitiesInterface::Get();
+            m_manager = azrtti_cast<AzFramework::SpawnableEntitiesManager*>(managerInterface);
+        }
+
+        void TearDown() override
+        {
+            delete m_ticket;
+            m_ticket = nullptr;
+            // One more tick on the spawnable entities manager in order to delete the ticket fully.
+            m_manager->ProcessQueue();
+
+            delete m_spawnableAsset;
+            m_spawnableAsset = nullptr;
+            // This will also delete m_spawnable.
+
+            delete m_application;
+            m_application = nullptr;
+
+            AllocatorsFixture::TearDown();
+        }
+
+        void FillSpawnable(size_t numElements)
+        {
+            AzFramework::Spawnable::EntityList& entities = m_spawnable->GetEntities();
+            entities.reserve(numElements);
+            for (size_t i=0; i<numElements; ++i)
+            {
+                entities.push_back(AZStd::make_unique<AZ::Entity>());
+            }
+        }
+
+    protected:
+        AZ::Data::Asset<AzFramework::Spawnable>* m_spawnableAsset { nullptr };
+        AzFramework::SpawnableEntitiesManager* m_manager { nullptr };
+        AzFramework::EntitySpawnTicket* m_ticket { nullptr };
+        AzFramework::Spawnable* m_spawnable { nullptr };
+        TestApplication* m_application { nullptr };
+    };
+
+    TEST_F(SpawnableEntitiesManagerTest, SpawnAllEntities_Call_AllEntitiesSpawned)
+    {
+        static constexpr size_t NumEntities = 4;
+        FillSpawnable(NumEntities);
+
+        size_t spawnedEntitiesCount = 0;
+        auto callback =
+            [&spawnedEntitiesCount](AzFramework::EntitySpawnTicket&, AzFramework::SpawnableConstEntityContainerView entities)
+            {
+                spawnedEntitiesCount += entities.size();
+            };
+        m_manager->SpawnAllEntities(*m_ticket, {}, AZStd::move(callback));
+        m_manager->ProcessQueue();
+
+        EXPECT_EQ(NumEntities, spawnedEntitiesCount);
+    }
+
+    TEST_F(SpawnableEntitiesManagerTest, ListEntities_Call_AllEntitiesAreReported)
+    {
+        static constexpr size_t NumEntities = 4;
+        FillSpawnable(NumEntities);
+
+        bool allValidEntityIds = true;
+        size_t spawnedEntitiesCount = 0;
+        auto callback = [&allValidEntityIds, &spawnedEntitiesCount]
+            (AzFramework::EntitySpawnTicket&, AzFramework::SpawnableConstEntityContainerView entities)
+            {
+                for (auto&& entity : entities)
+                {
+                    allValidEntityIds = entity->GetId().IsValid() && allValidEntityIds;
+                }
+                spawnedEntitiesCount += entities.size();
+            };
+
+        m_manager->SpawnAllEntities(*m_ticket);
+        m_manager->ListEntities(*m_ticket, AZStd::move(callback));
+        m_manager->ProcessQueue();
+
+        EXPECT_TRUE(allValidEntityIds);
+        EXPECT_EQ(NumEntities, spawnedEntitiesCount);
+    }
+
+    TEST_F(SpawnableEntitiesManagerTest, ListIndicesAndEntities_Call_AllEntitiesAreReportedAndIncrementByOne)
+    {
+        static constexpr size_t NumEntities = 4;
+        FillSpawnable(NumEntities);
+
+        bool allValidEntityIds = true;
+        size_t spawnedEntitiesCount = 0;
+        auto callback = [&allValidEntityIds, &spawnedEntitiesCount]
+            (AzFramework::EntitySpawnTicket&, AzFramework::SpawnableConstIndexEntityContainerView entities)
+            {
+                for (auto&& indexEntityPair : entities)
+                {
+                    // Since all entities are spawned a single time, the indices should be 0..NumEntities.
+                    if (indexEntityPair.GetIndex() == spawnedEntitiesCount)
+                    {
+                        spawnedEntitiesCount++;
+                    }
+                    allValidEntityIds = indexEntityPair.GetEntity()->GetId().IsValid() && allValidEntityIds;
+                }
+            };
+
+        m_manager->SpawnAllEntities(*m_ticket);
+        m_manager->ListIndicesAndEntities(*m_ticket, AZStd::move(callback));
+        m_manager->ProcessQueue();
+
+        EXPECT_TRUE(allValidEntityIds);
+        EXPECT_EQ(NumEntities, spawnedEntitiesCount);
+    }
+} // namespace UnitTest
diff --git a/Code/Framework/Tests/frameworktests_files.cmake b/Code/Framework/Tests/frameworktests_files.cmake
index 197bcc9fce..3fc84eb788 100644
--- a/Code/Framework/Tests/frameworktests_files.cmake
+++ b/Code/Framework/Tests/frameworktests_files.cmake
@@ -11,6 +11,7 @@
 
 set(FILES
     ../AzCore/Tests/Main.cpp
+    Spawnable/SpawnableEntitiesManagerTests.cpp
     ArchiveCompressionTests.cpp
     ArchiveTests.cpp
     BehaviorEntityTests.cpp
diff --git a/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake
index 28429729e1..edb6655411 100644
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@@ -9,6 +9,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
+
+set_property(GLOBAL PROPERTY LAUNCHER_UNIFIED_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 # Launcher targets for a project need to be generated when configuring a project.
 # When building the engine source, this file will be included by LauncherUnified's CMakeLists.txt
 # When using an installed engine, this file will be included by the FindLauncherGenerator.cmake script
@@ -40,28 +42,8 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
 
         # In the monolithic case, we need to register the gem modules, to do so we will generate a StaticModules.inl
         # file from StaticModules.in
-
+        set_property(GLOBAL APPEND PROPERTY LY_STATIC_MODULE_PROJECTS_NAME ${project_name})
         get_property(game_gem_dependencies GLOBAL PROPERTY LY_DELAYED_DEPENDENCIES_${project_name}.GameLauncher)
-        
-        unset(extern_module_declarations)
-        unset(module_invocations)
-
-        foreach(game_gem_dependency ${game_gem_dependencies})
-            # To match the convention on how gems targets vs gem modules are named, we remove the "Gem::" from prefix 
-            # and remove the ".Static" from the suffix
-            string(REGEX REPLACE "^Gem::" "Gem_" game_gem_dependency ${game_gem_dependency})
-            string(REGEX REPLACE "^Project::" "Project_" game_gem_dependency ${game_gem_dependency})
-            # Replace "." with "_"
-            string(REPLACE "." "_" game_gem_dependency ${game_gem_dependency})
-
-            string(APPEND extern_module_declarations "extern \"C\" AZ::Module* CreateModuleClass_${game_gem_dependency}();\n")
-            string(APPEND module_invocations "    modulesOut.push_back(CreateModuleClass_${game_gem_dependency}());\n")
-
-        endforeach()
-
-        configure_file(StaticModules.in
-            ${CMAKE_CURRENT_BINARY_DIR}/${project_name}.GameLauncher/Includes/StaticModules.inl
-        )
 
         set(game_build_dependencies 
             ${game_gem_dependencies}
@@ -70,29 +52,9 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
 
         if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
             get_property(server_gem_dependencies GLOBAL PROPERTY LY_DELAYED_DEPENDENCIES_${project_name}.ServerLauncher)
-        
-            unset(extern_module_declarations)
-            unset(module_invocations)
-
-            foreach(server_gem_dependency ${server_gem_dependencies})
-                # To match the convention on how gems targets vs gem modules are named, we remove the "Gem::" from prefix 
-                # and remove the ".Static" from the suffix
-                string(REGEX REPLACE "^Gem::" "Gem_" server_gem_dependency ${server_gem_dependency})
-                string(REGEX REPLACE "^Project::" "Project_" server_gem_dependency ${server_gem_dependency})
-                # Replace "." with "_"
-                string(REPLACE "." "_" server_gem_dependency ${server_gem_dependency})
-
-                string(APPEND extern_module_declarations "extern \"C\" AZ::Module* CreateModuleClass_${server_gem_dependency}();\n")
-                string(APPEND module_invocations "    modulesOut.push_back(CreateModuleClass_${server_gem_dependency}());\n")
-
-            endforeach()
-
-            configure_file(StaticModules.in
-                ${CMAKE_CURRENT_BINARY_DIR}/${project_name}.ServerLauncher/Includes/StaticModules.inl
-            )
 
             set(server_build_dependencies 
-                ${game_gem_dependencies}
+                ${server_gem_dependencies}
                 Legacy::CrySystem
             )
         endif()
@@ -186,3 +148,63 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
     endif()
 
 endforeach()
+
+#! Defer generation of the StaticModules.inl file needed in monolithic builds until after all the CMake targets are known
+#  This is that the GEM_MODULE target runtime dependencies can be parsed to discover the list of dependent modules
+#  to load
+function(ly_delayed_generate_static_modules_inl)
+    if(LY_MONOLITHIC_GAME)
+        get_property(launcher_unified_binary_dir GLOBAL PROPERTY LAUNCHER_UNIFIED_BINARY_DIR)
+        get_property(project_names GLOBAL PROPERTY LY_STATIC_MODULE_PROJECTS_NAME)
+        foreach(project_name ${project_names})
+
+            unset(extern_module_declarations)
+            unset(module_invocations)
+
+            unset(all_game_gem_dependencies)
+            ly_get_gem_load_dependencies(all_game_gem_dependencies ${project_name}.GameLauncher)
+
+            foreach(game_gem_dependency ${all_game_gem_dependencies})
+                # To match the convention on how gems targets vs gem modules are named,
+                # we remove the ".Static" from the suffix
+                # Replace "." with "_"
+                string(REPLACE "." "_" game_gem_dependency ${game_gem_dependency})
+
+                string(APPEND extern_module_declarations "extern \"C\" AZ::Module* CreateModuleClass_Gem_${game_gem_dependency}();\n")
+                string(APPEND module_invocations "    modulesOut.push_back(CreateModuleClass_Gem_${game_gem_dependency}());\n")
+
+            endforeach()
+
+            configure_file(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/StaticModules.in
+                ${launcher_unified_binary_dir}/${project_name}.GameLauncher/Includes/StaticModules.inl
+            )
+
+            if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
+                get_property(server_gem_dependencies GLOBAL PROPERTY LY_STATIC_MODULE_PROJECTS_DEPENDENCIES_${project_name}.ServerLauncher)
+
+                unset(extern_module_declarations)
+                unset(module_invocations)
+
+                unset(all_server_gem_dependencies)
+                ly_get_gem_load_dependencies(all_server_gem_dependencies ${project_name}.ServerLauncher)
+                foreach(server_gem_dependency ${server_gem_dependencies})
+                    ly_get_gem_load_dependencies(server_gem_load_dependencies ${server_gem_dependency})
+                    list(APPEND all_server_gem_dependencies ${server_gem_load_dependencies} ${server_gem_dependency})
+                endforeach()
+                foreach(server_gem_dependency ${all_server_gem_dependencies})
+                    # Replace "." with "_"
+                    string(REPLACE "." "_" server_gem_dependency ${server_gem_dependency})
+
+                    string(APPEND extern_module_declarations "extern \"C\" AZ::Module* CreateModuleClass_Gem_${server_gem_dependency}();\n")
+                    string(APPEND module_invocations "    modulesOut.push_back(CreateModuleClass_Gem_${server_gem_dependency}());\n")
+
+                endforeach()
+
+                configure_file(${CMAKE_CURRENT_FUNCTION_LIST_DIR}/StaticModules.in
+                    ${launcher_unified_binary_dir}/${project_name}.ServerLauncher/Includes/StaticModules.inl
+                )
+
+            endif()
+        endforeach()
+    endif()
+endfunction()
diff --git a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
index c8bd157b65..e0ba106875 100644
--- a/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+++ b/Code/Sandbox/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
@@ -137,8 +137,20 @@ namespace AzAssetBrowserRequestHandlerPrivate
                     entityName = AZStd::string::format("Entity%d", GetIEditor()->GetObjectManager()->GetObjectCount());
                 }
 
-                AZ::Entity* newEntity = aznew AZ::Entity(entityName.c_str());
-                EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::AddRequiredComponents, *newEntity);
+                AZ::EntityId targetEntityId;
+                EditorRequests::Bus::BroadcastResult(targetEntityId, &EditorRequests::CreateNewEntityAtPosition, worldTransform.GetTranslation(), AZ::EntityId());
+
+                AZ::Entity* newEntity = nullptr;
+                AZ::ComponentApplicationBus::BroadcastResult(newEntity, &AZ::ComponentApplicationRequests::FindEntity, targetEntityId);
+
+                if (newEntity == nullptr)
+                {
+                    return;
+                }
+
+                newEntity->SetName(entityName);
+
+                newEntity->Deactivate();
 
                 // Create component.
                 AZ::Component* newComponent = newEntity->CreateComponent(componentTypeId);
@@ -151,15 +163,7 @@ namespace AzAssetBrowserRequestHandlerPrivate
                     newEntity->AddComponent(newComponent);
                 }
 
-                //  Set entity position.
-                auto* transformComponent = newEntity->FindComponent<Components::TransformComponent>();
-                if (transformComponent)
-                {
-                    transformComponent->SetWorldTM(worldTransform);
-                }
-
-                // Add the entity to the editor context, which activates it and creates the sandbox object.
-                EditorEntityContextRequestBus::Broadcast(&EditorEntityContextRequests::AddEditorEntity, newEntity);
+                newEntity->Activate();
 
                 // set asset after components have been activated in AddEditorEntity method
                 if (newComponent)
diff --git a/Code/Sandbox/Editor/CMakeLists.txt b/Code/Sandbox/Editor/CMakeLists.txt
index c62e05f012..4706a61d08 100644
--- a/Code/Sandbox/Editor/CMakeLists.txt
+++ b/Code/Sandbox/Editor/CMakeLists.txt
@@ -173,6 +173,7 @@ ly_add_target(
     RUNTIME_DEPENDENCIES
         Legacy::CrySystem
         Legacy::EditorLib
+        ProjectManager
 )
 ly_add_translations(
     TARGETS Editor
diff --git a/Code/Sandbox/Editor/CryEdit.cpp b/Code/Sandbox/Editor/CryEdit.cpp
index 0bbc48d5f9..a0ff5d7eff 100644
--- a/Code/Sandbox/Editor/CryEdit.cpp
+++ b/Code/Sandbox/Editor/CryEdit.cpp
@@ -69,6 +69,7 @@ AZ_POP_DISABLE_WARNING
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
+#include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
 #include <AzToolsFramework/PythonTerminal/ScriptHelpDialog.h>
 
 // AzQtComponents
@@ -3105,6 +3106,15 @@ CCryEditApp::ECreateLevelResult CCryEditApp::CreateLevel(const QString& levelNam
     GetIEditor()->GetDocument()->SetPathName(fullyQualifiedLevelName);
     GetIEditor()->GetGameEngine()->SetLevelPath(levelPath);
 
+    if (usePrefabSystemForLevels)
+    {
+        auto* service = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
+        if (service)
+        {
+            service->CreateNewLevelPrefab(fullyQualifiedLevelName.toUtf8().constData(), DefaultLevelTemplateName);
+        }
+    }
+
     if (GetIEditor()->GetDocument()->Save())
     {
         if (!usePrefabSystemForLevels)
diff --git a/Code/Sandbox/Editor/CryEdit.h b/Code/Sandbox/Editor/CryEdit.h
index 2e71ca6a58..d4c1304b6a 100644
--- a/Code/Sandbox/Editor/CryEdit.h
+++ b/Code/Sandbox/Editor/CryEdit.h
@@ -358,6 +358,8 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING 
 
 private:
+    static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
+
     struct PythonOutputHandler;
     AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
     AZStd::shared_ptr<PythonOutputHandler> m_pythonOutputHandler;
diff --git a/Code/Sandbox/Editor/CryEditPy.cpp b/Code/Sandbox/Editor/CryEditPy.cpp
index 135dd9878c..edbeccb04f 100644
--- a/Code/Sandbox/Editor/CryEditPy.cpp
+++ b/Code/Sandbox/Editor/CryEditPy.cpp
@@ -533,7 +533,7 @@ namespace AzToolsFramework
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
             behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PC>("SystemConfigPlatform_Pc")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_GL>("SystemConfigPlatform_OsxGl")
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_MAC>("SystemConfigPlatform_Mac")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
             behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_METAL>("SystemConfigPlatform_OsxMetal")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
diff --git a/Code/Sandbox/Editor/RenderViewport.h b/Code/Sandbox/Editor/RenderViewport.h
index d70dd59b98..b45c92b1c8 100644
--- a/Code/Sandbox/Editor/RenderViewport.h
+++ b/Code/Sandbox/Editor/RenderViewport.h
@@ -200,6 +200,7 @@ public:
     {
         return {};
     }
+    float DeviceScalingFactor() override { return 1.0f; }
 
     // AzToolsFramework::ViewportFreezeRequestBus
     bool IsViewportInputFrozen() override;
diff --git a/Code/Sandbox/Editor/res/o3de_editor.ico b/Code/Sandbox/Editor/res/o3de_editor.ico
index 0680ceea19..e7b77c35bf 100644
--- a/Code/Sandbox/Editor/res/o3de_editor.ico
+++ b/Code/Sandbox/Editor/res/o3de_editor.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
-size 107016
+oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
+size 106449
diff --git a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
index c04f81f50c..ba705295ae 100644
--- a/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
+++ b/Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
@@ -14,6 +14,7 @@
 #include <AssetImporterPlugin.h>
 #include <AssetImporterWindow.h>
 #include <QtViewPaneManager.h>
+#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
 #include <SceneAPI/SceneCore/Utilities/Reporting.h>
 #include <LyViewPaneNames.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@@ -37,6 +38,10 @@ AssetImporterPlugin::AssetImporterPlugin(IEditor* editor)
     opt.showInMenu = false; // this view pane is used to display scene settings, but the user never opens it directly through the Tools menu
     opt.saveKeyName = "Scene Settings (PREVIEW)"; // user settings for this pane were originally saved with PREVIEW, so ensure that's how they are loaded as well, even after the PREVIEW is removed from the name
     AzToolsFramework::RegisterViewPane<AssetImporterWindow>(m_toolName.c_str(), LyViewPane::CategoryTools, opt);
+
+    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+        &AzToolsFramework::ToolsApplicationRequests::CreateAndAddEntityFromComponentTags,
+        AZStd::vector<AZ::Crc32>({ AZ::SceneAPI::Events::AssetImportRequest::GetAssetImportRequestComponentTag() }), "AssetImportersEntity");
 }
 
 void AssetImporterPlugin::Release()
diff --git a/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg
index 81fcdbcf12..ac546d4f39 100644
--- a/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg
@@ -3,7 +3,7 @@
         "AssetProcessor": {
             "Settings": {
                 "Platforms": {
-                    "es3": "enabled"
+                    "android": "enabled"
                 }
             }
         }
diff --git a/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
index 4156a6790d..be6cf61c29 100644
--- a/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
+++ b/Code/Tools/AssetBundler/tests/applicationManagerTests.cpp
@@ -17,6 +17,7 @@
 #include <AzToolsFramework/Application/ToolsApplication.h>
 #include <AzToolsFramework/Asset/AssetBundler.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistryImpl.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
@@ -57,6 +58,22 @@ namespace AssetBundler
             UnitTest::ScopedAllocatorSetupFixture::SetUp();
             m_data = AZStd::make_unique<StaticData>();
 
+            AZ::SettingsRegistryInterface* registry = nullptr;
+            if (!AZ::SettingsRegistry::Get())
+            {
+                AZ::SettingsRegistry::Register(&m_registry);
+                registry = &m_registry;
+            }
+            else
+            {
+                registry = AZ::SettingsRegistry::Get();
+            }
+            auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
+
             m_data->m_applicationManager.reset(aznew MockApplicationManagerTest(0, 0));
             m_data->m_applicationManager->Start(AzFramework::Application::Descriptor());
 
@@ -84,6 +101,12 @@ namespace AssetBundler
             delete m_data->m_localFileIO;
             AZ::IO::FileIOBase::SetInstance(m_data->m_priorFileIO);
 
+            auto settingsRegistry = AZ::SettingsRegistry::Get();
+            if(settingsRegistry == &m_registry)
+            {
+                AZ::SettingsRegistry::Unregister(settingsRegistry);
+            }
+
             m_data->m_applicationManager->Stop();
             m_data->m_applicationManager.reset();
             m_data.reset();
@@ -99,6 +122,7 @@ namespace AssetBundler
         };
 
         AZStd::unique_ptr<StaticData> m_data;
+        AZ::SettingsRegistryImpl m_registry;
     };
 
     TEST_F(ApplicationManagerTest, ValidatePlatformFlags_ReadConfigFiles_OK)
@@ -126,7 +150,7 @@ namespace AssetBundler
 
         AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(m_data->m_testEngineRoot.c_str(), m_data->m_testEngineRoot.c_str(), DummyProjectName);
         AzFramework::PlatformFlags hostPlatformFlag = AzFramework::PlatformHelper::GetPlatformFlag(AzToolsFramework::AssetSystem::GetHostAssetPlatform());
-        AzFramework::PlatformFlags expectedFlags = AzFramework::PlatformFlags::Platform_ES3 | AzFramework::PlatformFlags::Platform_IOS | AzFramework::PlatformFlags::Platform_PROVO | hostPlatformFlag;
+        AzFramework::PlatformFlags expectedFlags = AzFramework::PlatformFlags::Platform_ANDROID | AzFramework::PlatformFlags::Platform_IOS | AzFramework::PlatformFlags::Platform_PROVO | hostPlatformFlag;
         ASSERT_EQ(platformFlags, expectedFlags);
     }
 
diff --git a/Code/Tools/AssetBundler/tests/tests_main.cpp b/Code/Tools/AssetBundler/tests/tests_main.cpp
index 9e12623b0d..71046a576a 100644
--- a/Code/Tools/AssetBundler/tests/tests_main.cpp
+++ b/Code/Tools/AssetBundler/tests/tests_main.cpp
@@ -40,14 +40,14 @@ namespace AssetBundler
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_MacFile_OutputBaseNameAndPlatform)
     {
-        AZStd::string filePath = "assetInfoFile_osx_gl.xml";
+        AZStd::string filePath = "assetInfoFile_mac.xml";
         AZStd::string baseFilename;
         AZStd::string platformIdentifier;
 
         AzToolsFramework::SplitFilename(filePath, baseFilename, platformIdentifier);
 
         ASSERT_EQ(baseFilename, "assetInfoFile");
-        ASSERT_EQ(platformIdentifier, "osx_gl");
+        ASSERT_EQ(platformIdentifier, "mac");
     }
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_PcFile_OutputBaseNameAndPlatform)
@@ -64,14 +64,14 @@ namespace AssetBundler
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_MacFileWithUnderScoreInFileName_OutputBaseNameAndPlatform)
     {
-        AZStd::string filePath = "assetInfoFile_test_osx_gl.xml";
+        AZStd::string filePath = "assetInfoFile_test_mac.xml";
         AZStd::string baseFilename;
         AZStd::string platformIdentifier;
 
         AzToolsFramework::SplitFilename(filePath, baseFilename, platformIdentifier);
 
         ASSERT_EQ(baseFilename, "assetInfoFile_test");
-        ASSERT_EQ(platformIdentifier, "osx_gl");
+        ASSERT_EQ(platformIdentifier, "mac");
     }
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_PcFileWithUnderScoreInFileName_OutputBaseNameAndPlatform)
@@ -97,7 +97,28 @@ namespace AssetBundler
     {
     public:
         void SetUp() override
-        {
+        {          
+            AZ::SettingsRegistryInterface* registry = nullptr;
+            if (!AZ::SettingsRegistry::Get())
+            {
+                AZ::SettingsRegistry::Register(&m_registry);
+                registry = &m_registry;
+            }
+            else
+            {
+                registry = AZ::SettingsRegistry::Get();
+            }
+            auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
+            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
+            if (engineRoot.empty())
+            {
+                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to locate engine root.\n").c_str());
+            }
+
             m_data = AZStd::make_unique<StaticData>();
             m_data->m_application.reset(aznew AzToolsFramework::ToolsApplication());
             m_data->m_application.get()->Start(AzFramework::Application::Descriptor());
@@ -107,19 +128,6 @@ namespace AssetBundler
             // in the unit tests.
             AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize);
 
-            if (!AZ::SettingsRegistry::Get())
-            {
-                AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(m_registry);
-                AZ::SettingsRegistry::Register(&m_registry);
-            }
-
-            AZ::IO::FixedMaxPath engineRoot = AZ::Utils::GetEnginePath();
-            if (engineRoot.empty())
-            {
-                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to locate engine root.\n").c_str());
-            }
-
-
             m_data->m_testEngineRoot = (engineRoot / RelativeTestFolder).LexicallyNormal().String();
 
             m_data->m_localFileIO = aznew AZ::IO::LocalFileIO();
@@ -144,14 +152,24 @@ namespace AssetBundler
         }
         void TearDown() override
         {
-            AZ::IO::FileIOBase::SetInstance(nullptr);
-            delete m_data->m_localFileIO;
-            AZ::IO::FileIOBase::SetInstance(m_data->m_priorFileIO);
+            if (m_data)
+            {
+                AZ::IO::FileIOBase::SetInstance(nullptr);
+                delete m_data->m_localFileIO;
+                AZ::IO::FileIOBase::SetInstance(m_data->m_priorFileIO);
+
+                m_data->m_gemInfoList.set_capacity(0);
+                m_data->m_gemSeedFilePairList.set_capacity(0);
+                m_data->m_application.get()->Stop();
+                m_data->m_application.reset();
+            }
+
+            if(auto settingsRegistry = AZ::SettingsRegistry::Get();
+                settingsRegistry == &m_registry)
+            {
+                AZ::SettingsRegistry::Unregister(settingsRegistry);
+            }
 
-            m_data->m_gemInfoList.set_capacity(0);
-            m_data->m_gemSeedFilePairList.set_capacity(0);
-            m_data->m_application.get()->Stop();
-            m_data->m_application.reset();
         }
 
         void AddGemData(const char* engineRoot, const char* gemName, bool seedFileExists = true)
diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
index c477ec2c9e..4f8b4b9144 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp
@@ -78,17 +78,17 @@ namespace AssetBuilderSDK
         {
             return AssetBuilderSDK::Platform_PC;
         }
-        if (azstricmp(newPlatformName, "es3") == 0)
+        if (azstricmp(newPlatformName, "android") == 0)
         {
-            return AssetBuilderSDK::Platform_ES3;
+            return AssetBuilderSDK::Platform_ANDROID;
         }
         if (azstricmp(newPlatformName, "ios") == 0)
         {
             return AssetBuilderSDK::Platform_IOS;
         }
-        if (azstricmp(newPlatformName, "osx_gl") == 0)
+        if (azstricmp(newPlatformName, "mac") == 0)
         {
-            return AssetBuilderSDK::Platform_OSX;
+            return AssetBuilderSDK::Platform_MAC;
         }
         if (azstricmp(newPlatformName, "provo") == 0)
         {
@@ -115,12 +115,12 @@ namespace AssetBuilderSDK
         {
         case AssetBuilderSDK::Platform_PC:
             return "pc";
-        case AssetBuilderSDK::Platform_ES3:
-            return "es3";
+        case AssetBuilderSDK::Platform_ANDROID:
+            return "android";
         case AssetBuilderSDK::Platform_IOS:
             return "ios";
-        case AssetBuilderSDK::Platform_OSX:
-            return "osx_gl";
+        case AssetBuilderSDK::Platform_MAC:
+            return "mac";
         case AssetBuilderSDK::Platform_PROVO:
             return "provo";
         case AssetBuilderSDK::Platform_SALEM:
diff --git a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
index a11cc9a80d..126ecda2ba 100644
--- a/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
+++ b/Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h
@@ -148,15 +148,15 @@ namespace AssetBuilderSDK
     {
         Platform_NONE       = 0x00,
         Platform_PC         = 0x01,
-        Platform_ES3        = 0x02,
+        Platform_ANDROID    = 0x02,
         Platform_IOS        = 0x04,
-        Platform_OSX        = 0x08,
+        Platform_MAC        = 0x08,
         Platform_PROVO      = 0x20,
         Platform_SALEM      = 0x40,
         Platform_JASPER     = 0x80,
 
         //! if you add a new platform entry to this enum, you must add it to allplatforms as well otherwise that platform would not be considered valid. 
-        AllPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_PROVO | Platform_SALEM | Platform_JASPER
+        AllPlatforms = Platform_PC | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER
     };
 #endif // defined(ENABLE_LEGACY_PLATFORMFLAGS_SUPPORT)
     //! Map data structure to holder parameters that are passed into a job for ProcessJob requests.
@@ -503,7 +503,7 @@ namespace AssetBuilderSDK
         AZ_CLASS_ALLOCATOR(PlatformInfo, AZ::SystemAllocator, 0);
         AZ_TYPE_INFO(PlatformInfo, "{F7DA39A5-C319-4552-954B-3479E2454D3F}");
 
-        AZStd::string m_identifier; ///< like "pc" or "es3" or "ios"...
+        AZStd::string m_identifier; ///< like "pc" or "android" or "ios"...
         AZStd::unordered_set<AZStd::string> m_tags; ///< The tags like "console" or "tools" on that platform
 
         PlatformInfo() = default;
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
index 196f6b0543..8bc6d0b6f7 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.cpp
@@ -655,6 +655,80 @@ namespace AssetProcessor
         return true;
     }
 
+    bool AssetCatalog::GenerateRelativeSourcePath(
+        const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& rootFolder)
+    {
+        QString normalizedSourcePath = AssetUtilities::NormalizeFilePath(sourcePath.c_str());
+        QDir inputPath(normalizedSourcePath);
+        QString scanFolder;
+        QString relativeName;
+
+        bool validResult = false;
+
+        AZ_TracePrintf(AssetProcessor::DebugChannel, "ProcessGenerateRelativeSourcePathRequest: %s...\n", sourcePath.c_str());
+
+        if (sourcePath.empty())
+        {
+            // For an empty input path, do nothing, we'll return an empty, invalid result.
+            // (We check fullPath instead of inputPath, because an empty fullPath actually produces "." for inputPath)
+        }
+        else if (inputPath.isAbsolute())
+        {
+            // For an absolute path, try to convert it to a relative path, based on the existing scan folders.
+            // To get the inputPath, we use absolutePath() instead of path() so that any . or .. entries get collapsed.
+            validResult = m_platformConfig->ConvertToRelativePath(inputPath.absolutePath(), relativeName, scanFolder);
+        }
+        else if (inputPath.isRelative())
+        {
+            // For a relative path, concatenate it with each scan folder, and see if a valid relative path emerges.
+            int scanFolders = m_platformConfig->GetScanFolderCount();
+            for (int scanIdx = 0; scanIdx < scanFolders; scanIdx++)
+            {
+                auto& scanInfo = m_platformConfig->GetScanFolderAt(scanIdx);
+                QDir possibleRoot(scanInfo.ScanPath());
+                QDir possibleAbsolutePath = possibleRoot.filePath(normalizedSourcePath);
+                // To get the inputPath, we use absolutePath() instead of path() so that any . or .. entries get collapsed.
+                if (m_platformConfig->ConvertToRelativePath(possibleAbsolutePath.absolutePath(), relativeName, scanFolder))
+                {
+                    validResult = true;
+                    break;
+                }
+            }
+        }
+
+        // The input has produced a valid relative path.  However, the path might match multiple nested scan folders,
+        // so look to see if a higher-priority folder has a better match.
+        if (validResult)
+        {
+            QString overridingFile = m_platformConfig->GetOverridingFile(relativeName, scanFolder);
+
+            if (!overridingFile.isEmpty())
+            {
+                overridingFile = AssetUtilities::NormalizeFilePath(overridingFile);
+                validResult = m_platformConfig->ConvertToRelativePath(overridingFile, relativeName, scanFolder);
+            }
+        }
+
+        if (!validResult)
+        {
+            // if we are here it means we have failed to determine the relativePath, so we will send back the original path
+            AZ_TracePrintf(AssetProcessor::DebugChannel,
+                "GenerateRelativeSourcePath found no valid result, returning original path: %s...\n", sourcePath.c_str());
+
+            rootFolder.clear();
+            relativePath.clear();
+            relativePath = sourcePath;
+            return false;
+        }
+
+        relativePath = relativeName.toUtf8().data();
+        rootFolder = scanFolder.toUtf8().data();
+
+        AZ_Assert(!relativePath.empty(), "ConvertToRelativePath returned true, but relativePath is empty");
+
+        return true;
+    }
+
     bool AssetCatalog::GetFullSourcePathFromRelativeProductPath(const AZStd::string& relPath, AZStd::string& fullSourcePath)
     {
         ProcessGetFullSourcePathFromRelativeProductPathRequest(relPath, fullSourcePath);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
index f515fa3658..13dc7892b1 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetCatalog.h
@@ -95,6 +95,12 @@ namespace AssetProcessor
         const char* GetAbsoluteDevGameFolderPath() override;
         const char* GetAbsoluteDevRootFolderPath() override;
         bool GetRelativeProductPathFromFullSourceOrProductPath(const AZStd::string& fullPath, AZStd::string& relativeProductPath) override;
+
+        //! Given a partial or full source file path, respond with its relative path and the watch folder it is relative to.
+        //! The input source path does not need to exist, so this can be used for new files that haven't been saved yet.
+        bool GenerateRelativeSourcePath(
+            const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& watchFolder) override;
+
         bool GetFullSourcePathFromRelativeProductPath(const AZStd::string& relPath, AZStd::string& fullSourcePath) override;
         bool GetAssetInfoById(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType& assetType, const AZStd::string& platformName, AZ::Data::AssetInfo& assetInfo, AZStd::string& rootFilePath) override;
         bool GetSourceInfoBySourcePath(const char* sourcePath, AZ::Data::AssetInfo& assetInfo, AZStd::string& watchFolder) override;
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
index 97b28691dc..2d22d3d136 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/AssetRequestHandler.cpp
@@ -104,6 +104,27 @@ namespace
         return GetRelativeProductPathFromFullSourceOrProductPathResponse(relPathFound, relProductPath);
     }
 
+    GenerateRelativeSourcePathResponse HandleGenerateRelativeSourcePathRequest(
+        MessageData<GenerateRelativeSourcePathRequest> messageData)
+    {
+        bool relPathFound = false;
+        AZStd::string relPath;
+        AZStd::string watchFolder;
+
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            relPathFound, &AzToolsFramework::AssetSystemRequestBus::Events::GenerateRelativeSourcePath,
+            messageData.m_message->m_sourcePath, relPath, watchFolder);
+
+        if (!relPathFound)
+        {
+            AZ_TracePrintf(
+                AssetProcessor::ConsoleChannel, "Could not find relative source path for the source file (%s).",
+                messageData.m_message->m_sourcePath.c_str());
+        }
+
+        return GenerateRelativeSourcePathResponse(relPathFound, relPath, watchFolder);
+    }
+
     SourceAssetInfoResponse HandleSourceAssetInfoRequest(MessageData<SourceAssetInfoRequest> messageData)
     {
         SourceAssetInfoResponse response;
@@ -407,6 +428,7 @@ AssetRequestHandler::AssetRequestHandler()
 
     m_requestRouter.RegisterMessageHandler(&HandleGetFullSourcePathFromRelativeProductPathRequest);
     m_requestRouter.RegisterMessageHandler(&HandleGetRelativeProductPathFromFullSourceOrProductPathRequest);
+    m_requestRouter.RegisterMessageHandler(&HandleGenerateRelativeSourcePathRequest);
     m_requestRouter.RegisterMessageHandler(&HandleSourceAssetInfoRequest);
     m_requestRouter.RegisterMessageHandler(&HandleSourceAssetProductsInfoRequest);
     m_requestRouter.RegisterMessageHandler(&HandleGetScanFoldersRequest);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
index 88f74c886b..3dc8bd7a00 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
+++ b/Code/Tools/AssetProcessor/native/AssetManager/assetProcessorManager.h
@@ -57,6 +57,9 @@ namespace AzFramework
         class GetRelativeProductPathFromFullSourceOrProductPathRequest;
         class GetRelativeProductPathFromFullSourceOrProductPathResponse;
 
+        class GenerateRelativeSourcePathRequest;
+        class GenerateRelativeSourcePathResponse;
+
         class GetFullSourcePathFromRelativeProductPathRequest;
         class GetFullSourcePathFromRelativeProductPathResponse;
         class AssetNotificationMessage;
@@ -104,6 +107,8 @@ namespace AssetProcessor
         using GetAbsoluteAssetDatabaseLocationResponse = AzToolsFramework::AssetSystem::GetAbsoluteAssetDatabaseLocationResponse;
         using GetRelativeProductPathFromFullSourceOrProductPathRequest = AzFramework::AssetSystem::GetRelativeProductPathFromFullSourceOrProductPathRequest;
         using GetRelativeProductPathFromFullSourceOrProductPathResponse = AzFramework::AssetSystem::GetRelativeProductPathFromFullSourceOrProductPathResponse;
+        using GenerateRelativeSourcePathRequest = AzFramework::AssetSystem::GenerateRelativeSourcePathRequest;
+        using GenerateRelativeSourcePathResponse = AzFramework::AssetSystem::GenerateRelativeSourcePathResponse;
         using GetFullSourcePathFromRelativeProductPathRequest = AzFramework::AssetSystem::GetFullSourcePathFromRelativeProductPathRequest;
         using GetFullSourcePathFromRelativeProductPathResponse = AzFramework::AssetSystem::GetFullSourcePathFromRelativeProductPathResponse;
 
diff --git a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
index 523e39d622..3d7cc3b8b4 100644
--- a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
@@ -291,7 +291,6 @@ namespace AssetProcessor
                     }
                 }
 
-                AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(registry);
                 AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_EngineRegistry(registry, platform, specialization, &scratchBuffer);
                 AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_GemRegistries(registry, platform, specialization, &scratchBuffer);
                 AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_ProjectRegistry(registry, platform, specialization, &scratchBuffer);
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
index e92e9afba5..303f0ad0e8 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp
@@ -130,6 +130,9 @@ namespace AssetProcessor
             auto cacheRootKey =
                 AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_cache_path";
             settingsRegistry->Set(cacheRootKey, m_data->m_temporarySourceDir.absoluteFilePath("Cache").toUtf8().constData());
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            settingsRegistry->Set(projectPathKey, "AutomatedTesting");
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*settingsRegistry);
             AssetUtilities::ComputeProjectCacheRoot(m_data->m_cacheRootDir);
             QString normalizedCacheRoot = AssetUtilities::NormalizeDirectoryPath(m_data->m_cacheRootDir.absolutePath());
@@ -221,20 +224,28 @@ namespace AssetProcessor
             dbConn->SetScanFolder(newScanFolder);
         }
 
-        // build some default configs.
-        void BuildConfig(const QDir& tempPath, AssetDatabaseConnection* dbConn, PlatformConfiguration& config)
+        virtual void AddScanFolders(
+            const QDir& tempPath, AssetDatabaseConnection* dbConn, PlatformConfiguration& config,
+            const AZStd::vector<AssetBuilderSDK::PlatformInfo>& platforms)
         {
-            config.EnablePlatform({ "pc" ,{ "desktop", "renderer" } }, true);
-            config.EnablePlatform({ "es3" ,{ "mobile", "renderer" } }, true);
-            config.EnablePlatform({ "fandango" ,{ "console", "renderer" } }, false);
-            AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
-            config.PopulatePlatformsForScanFolder(platforms);
             //                                               PATH         DisplayName    PortKey      root    recurse  platforms     order
             AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder4"), "subfolder4", "subfolder4", false, false, platforms, -6), config, dbConn); // subfolder 4 overrides subfolder3
             AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder3"), "subfolder3", "subfolder3", false, false, platforms, -5), config, dbConn); // subfolder 3 overrides subfolder2
             AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder2"), "subfolder2", "subfolder2", false, true, platforms, -2), config, dbConn); // subfolder 2 overrides subfolder1
             AddScanFolder(ScanFolderInfo(tempPath.filePath("subfolder1"), "subfolder1", "subfolder1", false, true, platforms, -1), config, dbConn); // subfolder1 overrides root
             AddScanFolder(ScanFolderInfo(tempPath.absolutePath(), "temp", "tempfolder", true, false, platforms, 0), config, dbConn); // add the root
+        }
+
+        // build some default configs.
+        void BuildConfig(const QDir& tempPath, AssetDatabaseConnection* dbConn, PlatformConfiguration& config)
+        {
+            config.EnablePlatform({ "pc" ,{ "desktop", "renderer" } }, true);
+            config.EnablePlatform({ "android" ,{ "mobile", "renderer" } }, true);
+            config.EnablePlatform({ "fandango" ,{ "console", "renderer" } }, false);
+            AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
+            config.PopulatePlatformsForScanFolder(platforms);
+
+            AddScanFolders(tempPath, dbConn, config, platforms);
 
             config.AddMetaDataType("exportsettings", QString());
 
@@ -243,22 +254,22 @@ namespace AssetProcessor
 
             AssetRecognizer rec;
             AssetPlatformSpec specpc;
-            AssetPlatformSpec speces3;
+            AssetPlatformSpec specandroid;
 
-            speces3.m_extraRCParams = "somerandomparam";
+            specandroid.m_extraRCParams = "somerandomparam";
             rec.m_name = "random files";
             rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.random", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             rec.m_platformSpecs.insert("pc", specpc);
             config.AddRecognizer(rec);
 
             specpc.m_extraRCParams = ""; // blank must work
-            speces3.m_extraRCParams = "testextraparams";
+            specandroid.m_extraRCParams = "testextraparams";
 
             const char* builderTxt1Name = "txt files";
             rec.m_name = builderTxt1Name;
             rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             rec.m_platformSpecs.insert("pc", specpc);
-            rec.m_platformSpecs.insert("es3", speces3);
+            rec.m_platformSpecs.insert("android", specandroid);
 
             config.AddRecognizer(rec);
 
@@ -269,7 +280,7 @@ namespace AssetProcessor
             ignore_rec.m_name = "ignore files";
             ignore_rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.ignore", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             ignore_rec.m_platformSpecs.insert("pc", specpc);
-            ignore_rec.m_platformSpecs.insert("es3", ignore_spec);
+            ignore_rec.m_platformSpecs.insert("android", ignore_spec);
             config.AddRecognizer(ignore_rec);
 
             ExcludeAssetRecognizer excludeRecogniser;
@@ -356,7 +367,8 @@ namespace AssetProcessor
             return false;
         }
 
-        // Calls the GetFullSourcePathFromRelativeProductPath function and checks the return results, returning true if it matches both of the expected results
+        // Calls the GetFullSourcePathFromRelativeProductPath function and checks the return results, returning true if it matches both of
+        // the expected results
         bool TestGetFullSourcePath(const QString& fileToCheck, const QDir& tempPath, bool expectToFind, const char* expectedPath)
         {
             bool fullPathfound = false;
@@ -528,6 +540,177 @@ namespace AssetProcessor
         ASSERT_TRUE(TestGetRelativeProductPath(fileToCheck, true, { "aaa/basefile.txt" }));
     }
 
+    class AssetCatalogTestRelativeSourcePath : public AssetCatalogTest
+    {
+    public:
+        QDir GetRoot()
+        {
+            // Return an OS-friendly absolute root directory for our tests ("C:/sourceRoot" or "/sourceRoot").  It doesn't
+            // need to exist, it just needs to be an absolute path.
+            return QDir::root().filePath("sourceRoot");
+        }
+
+        // Set up custom scan folders for the "relative source path" tests, so that we can try out specific combinations of watch folders
+        void AddScanFolders(
+            [[maybe_unused]] const QDir& tempPath, AssetDatabaseConnection* dbConn, PlatformConfiguration& config,
+            const AZStd::vector<AssetBuilderSDK::PlatformInfo>& platforms) override
+        {
+            QDir root = GetRoot();
+
+            // This will set up the following watch folders, in highest to lowest priority:
+
+            // /sourceRoot/recurseNested/nested (recurse)
+            // /sourceRoot/noRecurse            (no recurse)
+            // /sourceRoot/recurseNotNested     (recurse)
+            // /sourceRoot/recurseNested        (recurse)
+
+            AddScanFolder(
+                ScanFolderInfo(root.filePath("recurseNested/nested"), "nested", "nested", false, true, platforms, -4), config, dbConn);
+            AddScanFolder(
+                ScanFolderInfo(root.filePath("noRecurse"), "noRecurse", "noRecurse", false, false, platforms, -3), config, dbConn);
+            AddScanFolder(
+                ScanFolderInfo(root.filePath("recurseNotNested"), "recurseNotNested", "recurseNotNested", false, true, platforms, -2),
+                config, dbConn);
+            AddScanFolder(
+                ScanFolderInfo(root.filePath("recurseNested"), "recurseNested", "recurseNested", false, true, platforms, -1),
+                config, dbConn);
+        }
+
+        // Calls the GenerateRelativeSourcePath function and validates that the results match the expected inputs.
+        void TestGetRelativeSourcePath(
+            const AZStd::string& sourcePath, bool expectedToFind, const AZStd::string& expectedPath, const AZStd::string& expectedRoot)
+        {
+            bool relPathFound = false;
+            AZStd::string relPath;
+            AZStd::string rootFolder;
+
+            AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+                relPathFound, &AzToolsFramework::AssetSystem::AssetSystemRequest::GenerateRelativeSourcePath, sourcePath,
+                relPath, rootFolder);
+
+            EXPECT_EQ(relPathFound, expectedToFind);
+            EXPECT_EQ(relPath, expectedPath);
+            EXPECT_EQ(rootFolder, expectedRoot);
+        }
+    };
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_EmptySourcePath_ReturnsNoMatch)
+    {
+        // Test passes in an empty source path, which shouldn't produce a valid result.
+        // Input:  empty source path
+        // Output: empty, not found result
+        TestGetRelativeSourcePath("", false, "", "");
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_AbsolutePathOutsideWatchFolders_ReturnsNoMatch)
+    {
+        // Test passes in an invalid absolute source path, which shouldn't produce a valid result.
+        // Input:  "/sourceRoot/noWatchFolder/test.txt"
+        // Output: not found result, which also returns the input as the relative file name
+        QDir watchFolder = GetRoot().filePath("noWatchFolder/");
+        QString fileToCheck = watchFolder.filePath("test.txt");
+
+        TestGetRelativeSourcePath(fileToCheck.toUtf8().constData(), false, fileToCheck.toUtf8().constData(), "");
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_AbsolutePathUnderWatchFolder_ReturnsRelativePath)
+    {
+        // Test passes in a valid absolute source path, which should produce a valid relative path
+        // Input:  "/sourceRoot/noRecurse/test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/noRecurse/"
+        QDir watchFolder = GetRoot().filePath("noRecurse/");
+        QString fileToCheck = watchFolder.filePath("test.txt");
+
+        TestGetRelativeSourcePath(fileToCheck.toUtf8().constData(), true, "test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_AbsolutePathUnderNestedWatchFolders_ReturnsRelativePath)
+    {
+        // Test passes in a valid absolute source path that matches a watch folder and a nested watch folder.
+        // The output relative path should match the nested folder, because the nested folder has a higher priority registered with the AP.
+        // Input:  "/sourceRoot/recurseNested/nested/test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/recurseNested/nested/"
+        QDir watchFolder = GetRoot().filePath("recurseNested/nested/");
+        QString fileToCheck = watchFolder.filePath("test.txt");
+
+        TestGetRelativeSourcePath(fileToCheck.toUtf8().constData(), true, "test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_BareFileNameValidInWatchFolder_ReturnsHighestPriorityWatchFolder)
+    {
+        // Test passes in a simple file name.  The output should be relative to the highest-priority watch folder.
+        // Input:  "test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/recurseNested/nested/"
+        QDir watchFolder = GetRoot().filePath("recurseNested/nested/");
+
+        TestGetRelativeSourcePath("test.txt", true, "test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathValidInWatchFolder_ReturnsHighestPriorityWatchFolder)
+    {
+        // Test passes in a relative path.  The output should preserve the relative path, but list it as relative to the highest-priority
+        // watch folder.
+        // Input:  "a/b/c/test.txt"
+        // Output: "a/b/c/test.txt" in folder "/sourceRoot/recurseNested/nested/"
+        QDir watchFolder = GetRoot().filePath("recurseNested/nested/");
+
+        TestGetRelativeSourcePath("a/b/c/test.txt", true, "a/b/c/test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathNotInWatchFolder_ReturnsNoMatch)
+    {
+        // Test passes in a relative path that "backs up" two directories.  This will be invalid, because no matter which watch directory
+        // we start at, the result will be outside of any watch directory.
+        // Input:  "../../test.txt"
+        // Output: not found result, which also returns the input as the relative file name
+        TestGetRelativeSourcePath("../../test.txt", false, "../../test.txt", "");
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathValidFromNestedWatchFolder_ReturnsOuterFolder)
+    {
+        // Test passes in a relative path that "backs up" one directory.  This will produce a valid result, because we can back up from
+        // the "recurseNested/nested/" watch folder to "recurseNested", which is also a valid watch folder.
+        // Input:  "../test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/recurseNested"
+        QDir watchFolder = GetRoot().filePath("recurseNested/");
+        TestGetRelativeSourcePath("../test.txt", true, "test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathMovesToParentWatchFolder_ReturnsOuterFolder)
+    {
+        // Test passes in a relative path that backs up one directory and then forward into a directory.  This will produce a valid
+        // result, because it can validly start in the highest-priority watch folder (recurseNested/nested), move back one into the
+        // outer watch folder (recurseNested), and then have a subdirectory within it.
+        // Note that it would also be valid to move from recurseNested to recurseNotNested, but that won't be the result of this test
+        // because that's a lower-priority match.
+        // Input:  "../recurseNotNested/test.txt"
+        // Output: "recurseNotNested/test.txt" in folder "/sourceRoot/recurseNested/"
+        QDir watchFolder = GetRoot().filePath("recurseNested/");
+
+        TestGetRelativeSourcePath("../recurseNotNested/test.txt", true, "recurseNotNested/test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathMovesToSiblingWatchFolder_ReturnsSiblingFolder)
+    {
+        // Test passes in a relative path that backs up two directories and then forward into a directory.  This will produce a valid
+        // result, because it can validly start in the recurseNested/nested folder, move back two folders, then forward into the sibling
+        // recurseNotNested folder.  The result will be a relative path to the sibling folder.
+        // Input:  "../../recurseNotNested/test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/recurseNotNested/"
+        QDir watchFolder = GetRoot().filePath("recurseNotNested/");
+
+        TestGetRelativeSourcePath("../../recurseNotNested/test.txt", true, "test.txt", watchFolder.path().toUtf8().constData());
+    }
+
+    TEST_F(AssetCatalogTestRelativeSourcePath, GenerateRelativeSourcePath_RelativePathBacksOutOfWatchFolder_ReturnsNoMatch)
+    {
+        // Test passes in a relative path that adds a directory, then "backs up" three directories.  This will be invalid, because no
+        // matter which watch directory we start at, the result will be outside of any watch directory.
+        // Input:  "../test.txt"
+        // Output: "test.txt" in folder "/sourceRoot/recurseNested"
+        TestGetRelativeSourcePath("a/../../../test.txt", false, "a/../../../test.txt", "");
+    }
+
     class AssetCatalogTest_GetFullSourcePath
         : public AssetCatalogTest
     {
@@ -909,7 +1092,7 @@ namespace AssetProcessor
         {
             AssetCatalogTest::SetUp();
             m_platforms.push_back("pc");
-            m_platforms.push_back("es3");
+            m_platforms.push_back("android");
 
             // 4 products for one platform, 1 product for the other.
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefilez.arc2");
@@ -917,7 +1100,7 @@ namespace AssetProcessor
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefile.arc2");
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefile.azm2");
 
-            m_platformToProductsForSourceWithDifferentProducts["es3"].push_back("subfolder3/es3exclusivefile.azm2");
+            m_platformToProductsForSourceWithDifferentProducts["android"].push_back("subfolder3/androidexclusivefile.azm2");
 
             m_sourceFileWithDifferentProductsPerPlatform = AZ::Uuid::CreateString("{38032FC9-2838-4D6A-9DA0-79E5E4F20C1B}");
             m_sourceFileWithDependency = AZ::Uuid::CreateString("{807C4174-1D19-42AD-B8BC-A59291D9388C}");
@@ -930,7 +1113,7 @@ namespace AssetProcessor
             // resulting in image processing jobs having different products per platform. Because of this, the material jobs will then have different
             // dependencies per platform, because each material will depend on a referenced texture and all of that texture's mipmaps.
 
-            // Add a source file with 4 products on pc, but 1 on es3
+            // Add a source file with 4 products on pc, but 1 on android
             bool result = AddSourceAndJobForMultiplePlatforms(
                 "subfolder3",
                 "MultiplatformFile.txt",
@@ -945,7 +1128,7 @@ namespace AssetProcessor
             result = AddSourceAndJobForMultiplePlatforms("subfolder3", "FileWithDependency.txt", &(m_data->m_dbConn), sourceFileWithSameProductsJobsPerPlatform, m_platforms, m_sourceFileWithDependency);
             EXPECT_TRUE(result);
 
-            const AZStd::string fileWithDependencyProductPath = "subfolder3/es3exclusivefile.azm2";
+            const AZStd::string fileWithDependencyProductPath = "subfolder3/androidexclusivefile.azm2";
 
             for (const AZStd::string& platform : m_platforms)
             {
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
index c33943f9a7..04949c82a9 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorMessagesTests.cpp
@@ -265,6 +265,9 @@ namespace AssetProcessorMessagesTests
 
         addPairFunc(new GetFullSourcePathFromRelativeProductPathRequest(), new GetFullSourcePathFromRelativeProductPathResponse());
         addPairFunc(new GetRelativeProductPathFromFullSourceOrProductPathRequest(), new GetRelativeProductPathFromFullSourceOrProductPathResponse());
+        addPairFunc(
+            new GenerateRelativeSourcePathRequest(),
+            new GenerateRelativeSourcePathResponse());
         addPairFunc(new SourceAssetInfoRequest(), new SourceAssetInfoResponse());
         addPairFunc(new SourceAssetProductsInfoRequest(), new SourceAssetProductsInfoResponse());
         addPairFunc(new GetScanFoldersRequest(), new GetScanFoldersResponse());
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
index d04e13aef2..7b88321ad9 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.cpp
@@ -12,7 +12,7 @@
 
 #include "AssetProcessorTest.h"
 
-
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
 #include "BaseAssetProcessorTest.h"
@@ -67,6 +67,12 @@ namespace AssetProcessor
             static char processName[] = {"AssetProcessorBatch"};
             static char* namePtr = &processName[0];
             static char** paramStringArray = &namePtr;
+
+            auto registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
             
             m_application.reset(new UnitTestAppManager(&numParams, &paramStringArray));
             ASSERT_EQ(m_application->BeforeRun(), ApplicationManager::Status_Success);
diff --git a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
index c866a933dd..4ea0695f1c 100644
--- a/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/AssetProcessorTest.h
@@ -14,6 +14,7 @@
 #include <AzTest/AzTest.h>
 #include <AzCore/Memory/Memory.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzFramework/Application/Application.h>
 #include <native/utilities/assetUtils.h>
 #include <native/unittests/UnitTestRunner.h> // for the assert absorber.
@@ -44,7 +45,18 @@ namespace AssetProcessor
                 AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
             }
             m_errorAbsorber = new UnitTestUtils::AssertAbsorber();
+
             m_application = AZStd::make_unique<AzFramework::Application>();
+
+            // Inject the AutomatedTesting project as a project path into test fixture
+            using FixedValueString = AZ::SettingsRegistryInterface::FixedValueString;
+            constexpr auto projectPathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            if(auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+            {
+                settingsRegistry->Set(projectPathKey, "AutomatedTesting");
+                AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*settingsRegistry);
+            }
         }
 
         void TearDown() override
diff --git a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
index c2931c6a09..671d8d96a9 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp
@@ -28,7 +28,7 @@ namespace AssetProcessor
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformsCount(), 2);
@@ -48,19 +48,19 @@ namespace AssetProcessor
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
-            { "es3", {}
+            { "android", {}
             }
         };
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
@@ -72,24 +72,24 @@ namespace AssetProcessor
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }, { "ios", {}
-            }, { "osx_gl", {}
+            }, { "mac", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_IOS);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(3), AssetBuilderSDK::Platform_OSX);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(3), AssetBuilderSDK::Platform_MAC);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(4), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_NONE);
         // using a deprecated API should have generated warnings.
         // but we can't test for it because these warnings are WarningOnce and some other unit test might have already triggered it
@@ -106,23 +106,23 @@ namespace AssetProcessor
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_FALSE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_FALSE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
         // using a deprecated API should have generated warnings.
         // but we can't test for it because these warnings are WarningOnce and some other unit test might have already triggered it
     }
@@ -133,9 +133,9 @@ namespace AssetProcessor
         UnitTestUtils::AssertAbsorber absorb;
 
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_ANDROID));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_IOS));
-        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_OSX));
+        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_MAC));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_PROVO));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_SALEM));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_JASPER));
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
index 07d1e48229..bd99cf7a94 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
@@ -204,6 +204,9 @@ void AssetProcessorManagerTest::SetUp()
     auto cacheRootKey =
         AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_cache_path";
     registry->Set(cacheRootKey, tempPath.absoluteFilePath("Cache").toUtf8().constData());
+    auto projectPathKey =
+        AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+    registry->Set(projectPathKey, "AutomatedTesting");
     AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
 
     m_data->m_databaseLocationListener.BusConnect();
@@ -4017,15 +4020,15 @@ TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesFor
     m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
     AssetUtilities::SetUseFileHashOverride(true, true);
 
-    // Enable es3 platform after the initial SetUp has already processed the files for pc
+    // Enable android platform after the initial SetUp has already processed the files for pc
     QDir tempPath(m_tempDir.path());
-    AssetBuilderSDK::PlatformInfo es3Platform("es3", { "host", "renderer" });
-    m_config->EnablePlatform(es3Platform, true);
+    AssetBuilderSDK::PlatformInfo androidPlatform("android", { "host", "renderer" });
+    m_config->EnablePlatform(androidPlatform, true);
 
     // There's no way to remove scanfolders and adding a new one after enabling the platform will cause the pc assets to build as well, which we don't want
     // Instead we'll just const cast the vector and modify the enabled platforms for the scanfolder
     auto& platforms = const_cast<AZStd::vector<AssetBuilderSDK::PlatformInfo>&>(m_config->GetScanFolderAt(0).GetPlatforms());
-    platforms.push_back(es3Platform);
+    platforms.push_back(androidPlatform);
 
     // We need the builder fingerprints to be updated to reflect the newly enabled platform
     m_assetProcessorManager->ComputeBuilderDirty();
@@ -4033,10 +4036,10 @@ TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesFor
     QSet<AssetFileInfo> filePaths = BuildFileSet();
     SimulateAssetScanner(filePaths);
 
-    ExpectWork(4, 2); // CreateJobs = 4, 2 files * 2 platforms.  ProcessJobs = 2, just the es3 platform jobs (pc is already processed)
+    ExpectWork(4, 2); // CreateJobs = 4, 2 files * 2 platforms.  ProcessJobs = 2, just the android platform jobs (pc is already processed)
 
-    ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("es3"));
-    ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("es3"));
+    ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("android"));
+    ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("android"));
 }
 
 TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestamp)
diff --git a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
index 31e4996b1e..9c80b267eb 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp
@@ -39,7 +39,6 @@ void PlatformConfigurationUnitTests::SetUp()
     m_qApp = new QCoreApplication(m_argc, m_argv);
     AssetProcessorTest::SetUp();
     AssetUtilities::ResetAssetRoot();
-
 }
 
 void PlatformConfigurationUnitTests::TearDown()
@@ -121,14 +120,14 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Regular_Platforms)
 
     // verify the data.
     ASSERT_NE(config.GetPlatformByIdentifier(AzToolsFramework::AssetSystem::GetHostAssetPlatform()), nullptr);
-    ASSERT_NE(config.GetPlatformByIdentifier("es3"), nullptr);
+    ASSERT_NE(config.GetPlatformByIdentifier("android"), nullptr);
     ASSERT_NE(config.GetPlatformByIdentifier("server"), nullptr);
 
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("mobile"));
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("renderer"));
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("android"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("mobile"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("renderer"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("android"));
     ASSERT_TRUE(config.GetPlatformByIdentifier("server")->HasTag("server"));
-    ASSERT_FALSE(config.GetPlatformByIdentifier("es3")->HasTag("server"));
+    ASSERT_FALSE(config.GetPlatformByIdentifier("android")->HasTag("server"));
     ASSERT_FALSE(config.GetPlatformByIdentifier("server")->HasTag("renderer"));
 }
 
@@ -398,7 +397,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolderP
     AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms = config.GetScanFolderAt(0).GetPlatforms();
     ASSERT_EQ(platforms.size(), 4);
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo(AzToolsFramework::AssetSystem::GetHostAssetPlatform(), AZStd::unordered_set<AZStd::string>{})) != platforms.end());
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("ios", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("server", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
@@ -406,12 +405,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolderP
     platforms = config.GetScanFolderAt(1).GetPlatforms();
     ASSERT_EQ(platforms.size(), 2);
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo(AzToolsFramework::AssetSystem::GetHostAssetPlatform(), AZStd::unordered_set<AZStd::string>{})) != platforms.end());
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
     ASSERT_EQ(config.GetScanFolderAt(2).GetDisplayName(), QString("folder1output"));
     platforms = config.GetScanFolderAt(2).GetPlatforms();
     ASSERT_EQ(platforms.size(), 1);
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
     ASSERT_EQ(config.GetScanFolderAt(3).GetDisplayName(), QString("folder2output"));
     platforms = config.GetScanFolderAt(3).GetPlatforms();
@@ -455,7 +454,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
 #if defined(AZ_PLATFORM_WINDOWS)
-    const char* platformWhichIsNotCurrentPlatform = "osx_gl";
+    const char* platformWhichIsNotCurrentPlatform = "mac";
 #else
     const char* platformWhichIsNotCurrentPlatform = "pc";
 #endif
@@ -476,27 +475,27 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_pattern, "*.i_caf");
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_type, AssetBuilderSDK::AssetBuilderPattern::Wildcard);
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs.size(), 2);
-    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_FALSE(recogs["i_caf"].m_platformSpecs.contains("server")); // server has been set to skip.
-    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["es3"].m_extraRCParams, "mobile");
+    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["android"].m_extraRCParams, "mobile");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "defaultparams");
 
     ASSERT_TRUE(recogs.contains("caf"));
-    ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("server"));
     ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_EQ(recogs["caf"].m_platformSpecs.size(), 3);
-    ASSERT_EQ(recogs["caf"].m_platformSpecs["es3"].m_extraRCParams, "rendererparams");
+    ASSERT_EQ(recogs["caf"].m_platformSpecs["android"].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["caf"].m_platformSpecs["server"].m_extraRCParams, "copy");
 
     ASSERT_TRUE(recogs.contains("mov"));
-    ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("server"));
     ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_EQ(recogs["mov"].m_platformSpecs.size(), 3);
-    ASSERT_EQ(recogs["mov"].m_platformSpecs["es3"].m_extraRCParams, "platformspecificoverride");
+    ASSERT_EQ(recogs["mov"].m_platformSpecs["android"].m_extraRCParams, "platformspecificoverride");
     ASSERT_EQ(recogs["mov"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["mov"].m_platformSpecs["server"].m_extraRCParams, "copy");
 
@@ -504,27 +503,27 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     // (but platforms can override it)
     ASSERT_TRUE(recogs.contains("rend"));
     ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("server"));
     ASSERT_FALSE(recogs["rend"].m_platformSpecs.contains(platformWhichIsNotCurrentPlatform)); // this is not an enabled platform and should not be there.
     ASSERT_EQ(recogs["rend"].m_platformSpecs.size(), 3);
     ASSERT_EQ(recogs["rend"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
-    ASSERT_EQ(recogs["rend"].m_platformSpecs["es3"].m_extraRCParams, "rendererparams");
+    ASSERT_EQ(recogs["rend"].m_platformSpecs["android"].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["rend"].m_platformSpecs["server"].m_extraRCParams, ""); // default if not specified is empty string
 
     ASSERT_TRUE(recogs.contains("alldefault"));
     ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("server"));
     ASSERT_FALSE(recogs["alldefault"].m_platformSpecs.contains(platformWhichIsNotCurrentPlatform)); // this is not an enabled platform and should not be there.
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs.size(), 3);
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "");
-    ASSERT_EQ(recogs["alldefault"].m_platformSpecs["es3"].m_extraRCParams, "");
+    ASSERT_EQ(recogs["alldefault"].m_platformSpecs["android"].m_extraRCParams, "");
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs["server"].m_extraRCParams, "");
 
     ASSERT_TRUE(recogs.contains("skipallbutone"));
     ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains("es3"));
+    ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["skipallbutone"].m_platformSpecs.contains("server")); // server is only one enabled (set to copy)
     ASSERT_EQ(recogs["skipallbutone"].m_platformSpecs.size(), 1);
     ASSERT_EQ(recogs["skipallbutone"].m_platformSpecs["server"].m_extraRCParams, "copy");
@@ -550,7 +549,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Overrides)
 
     // verify the data.
     ASSERT_NE(config.GetPlatformByIdentifier(AzToolsFramework::AssetSystem::GetHostAssetPlatform()), nullptr);
-    ASSERT_NE(config.GetPlatformByIdentifier("es3"), nullptr);
+    ASSERT_NE(config.GetPlatformByIdentifier("android"), nullptr);
     ASSERT_NE(config.GetPlatformByIdentifier("provo"), nullptr);
     // this override swaps server with provo in that it turns ON provo, turns off server
     ASSERT_EQ(config.GetPlatformByIdentifier("server"), nullptr); // this should be off due to overrides
@@ -567,11 +566,11 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Overrides)
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_pattern, "*.i_caf");
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_type, AssetBuilderSDK::AssetBuilderPattern::Wildcard);
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs.size(), 3);
-    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("provo"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_FALSE(recogs["i_caf"].m_platformSpecs.contains("server")); // server has been set to skip.
-    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["es3"].m_extraRCParams, "mobile");
+    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["android"].m_extraRCParams, "mobile");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "defaultparams");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs["provo"].m_extraRCParams, "copy");
 
diff --git a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
index fe669460a8..0fb67ab947 100644
--- a/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
+++ b/Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.h
@@ -37,6 +37,5 @@ private:
     int         m_argc;
     char**      m_argv;
     QCoreApplication* m_qApp;
-    
 };
 
diff --git a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
index 5940caadb7..079cdb7c66 100644
--- a/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp
@@ -51,6 +51,8 @@ namespace AssetProcessor
     public:
         using GetRelativeProductPathFromFullSourceOrProductPathRequest = AzFramework::AssetSystem::GetRelativeProductPathFromFullSourceOrProductPathRequest;
         using GetRelativeProductPathFromFullSourceOrProductPathResponse = AzFramework::AssetSystem::GetRelativeProductPathFromFullSourceOrProductPathResponse;
+        using GenerateRelativeSourcePathRequest = AzFramework::AssetSystem::GenerateRelativeSourcePathRequest;
+        using GenerateRelativeSourcePathResponse = AzFramework::AssetSystem::GenerateRelativeSourcePathResponse;
         using GetFullSourcePathFromRelativeProductPathRequest = AzFramework::AssetSystem::GetFullSourcePathFromRelativeProductPathRequest;
         using GetFullSourcePathFromRelativeProductPathResponse = AzFramework::AssetSystem::GetFullSourcePathFromRelativeProductPathResponse;
     };
@@ -88,34 +90,34 @@ namespace AssetProcessor
             //AZ_TracePrintf("test", "-------------------------\n");
         }
 
-        void ComputeFingerprints(unsigned int& fingerprintForPC, unsigned int& fingerprintForES3, PlatformConfiguration& config, QString scanFolderPath, QString relPath)
+        void ComputeFingerprints(unsigned int& fingerprintForPC, unsigned int& fingerprintForANDROID, PlatformConfiguration& config, QString scanFolderPath, QString relPath)
         {
             QString extraInfoForPC;
-            QString extraInfoForES3;
+            QString extraInfoForANDROID;
             RecognizerPointerContainer output;
             QString filePath = scanFolderPath + "/" + relPath;
             config.GetMatchingRecognizers(filePath, output);
             for (const AssetRecognizer* assetRecogniser : output)
             {
                 extraInfoForPC.append(assetRecogniser->m_platformSpecs["pc"].m_extraRCParams);
-                extraInfoForES3.append(assetRecogniser->m_platformSpecs["es3"].m_extraRCParams);
+                extraInfoForANDROID.append(assetRecogniser->m_platformSpecs["android"].m_extraRCParams);
                 extraInfoForPC.append(assetRecogniser->m_version);
-                extraInfoForES3.append(assetRecogniser->m_version);
+                extraInfoForANDROID.append(assetRecogniser->m_version);
             }
 
-            //Calculating fingerprints for the file for pc and es3 platforms
+            //Calculating fingerprints for the file for pc and android platforms
             AZ::Uuid sourceId = AZ::Uuid("{2206A6E0-FDBC-45DE-B6FE-C2FC63020BD5}");
             JobEntry jobEntryPC(scanFolderPath, relPath, relPath, 0, { "pc", {"desktop", "renderer"} }, "", 0, 1, sourceId);
-            JobEntry jobEntryES3(scanFolderPath, relPath, relPath, 0, { "es3", {"mobile", "renderer"} }, "", 0, 2, sourceId);
+            JobEntry jobEntryANDROID(scanFolderPath, relPath, relPath, 0, { "android", {"mobile", "renderer"} }, "", 0, 2, sourceId);
 
             JobDetails jobDetailsPC;
             jobDetailsPC.m_extraInformationForFingerprinting = extraInfoForPC.toUtf8().constData();
             jobDetailsPC.m_jobEntry = jobEntryPC;
-            JobDetails jobDetailsES3;
-            jobDetailsES3.m_extraInformationForFingerprinting = extraInfoForES3.toUtf8().constData();
-            jobDetailsES3.m_jobEntry = jobEntryES3;
+            JobDetails jobDetailsANDROID;
+            jobDetailsANDROID.m_extraInformationForFingerprinting = extraInfoForANDROID.toUtf8().constData();
+            jobDetailsANDROID.m_jobEntry = jobEntryANDROID;
             fingerprintForPC = AssetUtilities::GenerateFingerprint(jobDetailsPC);
-            fingerprintForES3 = AssetUtilities::GenerateFingerprint(jobDetailsES3);
+            fingerprintForANDROID = AssetUtilities::GenerateFingerprint(jobDetailsANDROID);
         }
     }
 
@@ -240,7 +242,7 @@ namespace AssetProcessor
 
         PlatformConfiguration config;
         config.EnablePlatform({ "pc",{ "desktop", "renderer" } }, true);
-        config.EnablePlatform({ "es3",{ "mobile", "renderer" } }, true);
+        config.EnablePlatform({ "android",{ "mobile", "renderer" } }, true);
         config.EnablePlatform({ "fandago",{ "console", "renderer" } }, false);
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
@@ -259,9 +261,9 @@ namespace AssetProcessor
 
         AssetRecognizer rec;
         AssetPlatformSpec specpc;
-        AssetPlatformSpec speces3;
+        AssetPlatformSpec specandroid;
 
-        speces3.m_extraRCParams = "somerandomparam";
+        specandroid.m_extraRCParams = "somerandomparam";
         rec.m_name = "random files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.random", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
@@ -269,13 +271,13 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(mockAppManager.RegisterAssetRecognizerAsBuilder(rec));
 
         specpc.m_extraRCParams = ""; // blank must work
-        speces3.m_extraRCParams = "testextraparams";
+        specandroid.m_extraRCParams = "testextraparams";
 
         const char* builderTxt1Name = "txt files";
         rec.m_name = builderTxt1Name;
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
 
         config.AddRecognizer(rec);
 
@@ -305,21 +307,21 @@ namespace AssetProcessor
         rec.m_testLockSource = false;
 
         specpc.m_extraRCParams = "pcparams";
-        speces3.m_extraRCParams = "es3params";
+        specandroid.m_extraRCParams = "androidparams";
 
         rec.m_name = "xxx files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.xxx", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         config.AddRecognizer(rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(rec);
 
         // two recognizers for the same pattern.
         rec.m_name = "xxx files 2 (builder2)";
         specpc.m_extraRCParams = "pcparams2";
-        speces3.m_extraRCParams = "es3params2";
+        specandroid.m_extraRCParams = "androidparams2";
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         config.AddRecognizer(rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(rec);
 
@@ -330,7 +332,7 @@ namespace AssetProcessor
         ignore_rec.m_name = "ignore files";
         ignore_rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.ignore", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         ignore_rec.m_platformSpecs.insert("pc", specpc);
-        ignore_rec.m_platformSpecs.insert("es3", ignore_spec);
+        ignore_rec.m_platformSpecs.insert("android", ignore_spec);
         config.AddRecognizer(ignore_rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(ignore_rec);
 
@@ -432,7 +434,7 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1); // 1, since we have one recognizer for .ignore, but the 'es3' platform is marked as skip
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1); // 1, since we have one recognizer for .ignore, but the 'android' platform is marked as skip
         UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
 
@@ -455,16 +457,16 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
 
-        QList<int> es3JobsIndex;
+        QList<int> androidJobsIndex;
         QList<int> pcJobsIndex;
         for (int checkIdx = 0; checkIdx < 4; ++checkIdx)
         {
@@ -662,19 +664,19 @@ namespace AssetProcessor
         // ---------- test successes ----------
 
 
-        QStringList es3outs;
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.arc1")));
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.arc2")));
+        QStringList androidouts;
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.arc1")));
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.arc2")));
 
         // feed it the messages its waiting for (create the files)
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "products."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[1], "products."))
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "products."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[1], "products."))
 
-        //Invoke Asset Processed for es3 platform , txt files job description
+        //Invoke Asset Processed for android platform , txt files job description
         AssetBuilderSDK::ProcessJobResponse response;
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[1].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[1].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
 
         // make sure legacy SubIds get stored in the DB and in asset response messages.
         // also make sure they don't get filed for the wrong asset.
@@ -693,8 +695,8 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
 
         // always RELATIVE, always with the product name.
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefile.arc1");
         UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_data == "basefile.arc2");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
@@ -793,14 +795,14 @@ namespace AssetProcessor
         changedInputResults.clear();
         assetMessages.clear();
 
-        es3outs.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.azm")));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "products."));
+        androidouts.clear();
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.azm")));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "products."));
 
-        //Invoke Asset Processed for es3 platform , txt files2 job description
+        //Invoke Asset Processed for android platform , txt files2 job description
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
 
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
@@ -812,7 +814,7 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
 
         // always RELATIVE, always with the product name.
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefile.azm");
 
         changedInputResults.clear();
@@ -1002,11 +1004,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1025,25 +1027,25 @@ namespace AssetProcessor
 
         // this time make different products:
 
-        QStringList oldes3outs;
+        QStringList oldandroidouts;
         QStringList oldpcouts;
-        oldes3outs = es3outs;
+        oldandroidouts = androidouts;
         oldpcouts.append(pcouts);
-        QStringList es3outs2;
+        QStringList androidouts2;
         QStringList pcouts2;
-        es3outs.clear();
+        androidouts.clear();
         pcouts.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefilea.arc1")));
-        es3outs2.push_back(cacheRoot.filePath(QString("es3/basefilea.azm")));
-        // note that the ES3 outs have changed
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefilea.arc1")));
+        androidouts2.push_back(cacheRoot.filePath(QString("android/basefilea.azm")));
+        // note that the android outs have changed
         // but the pc outs are still the same.
         pcouts.push_back(cacheRoot.filePath(QString("pc/basefile.arc1")));
         pcouts2.push_back(cacheRoot.filePath(QString("pc/basefile.azm")));
 
         // feed it the messages its waiting for (create the files)
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
 
         QCoreApplication::processEvents(QEventLoop::AllEvents | QEventLoop::WaitForMoreEvents, 50);
@@ -1055,12 +1057,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1083,12 +1085,12 @@ namespace AssetProcessor
         // The files removed should be the ones we did not emit this time
         // note that order isn't guarantee but an example output it this
 
-        // [0] Removed: ES3, basefile.arc1
-        // [1] Removed: ES3, basefile.arc2
-        // [2] Changed: ES3, basefilea.arc1 (added)
+        // [0] Removed: ANDROID, basefile.arc1
+        // [1] Removed: ANDROID, basefile.arc2
+        // [2] Changed: ANDROID, basefilea.arc1 (added)
 
-        // [3] Removed: ES3, basefile.azm
-        // [4] Changed: ES3, basefilea.azm (added)
+        // [3] Removed: ANDROID, basefile.azm
+        // [4] Changed: ANDROID, basefilea.azm (added)
 
         // [5] changed: PC, basefile.arc1 (changed)
         // [6] changed: PC, basefile.azm (changed)
@@ -1110,18 +1112,18 @@ namespace AssetProcessor
             if (element.m_data == "basefilea.arc1")
             {
                 UNIT_TEST_EXPECT_TRUE(element.m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
-                UNIT_TEST_EXPECT_TRUE(element.m_platform == "es3");
+                UNIT_TEST_EXPECT_TRUE(element.m_platform == "android");
             }
 
             if (element.m_data == "basefile.arc2")
             {
                 UNIT_TEST_EXPECT_TRUE(element.m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetRemoved);
-                UNIT_TEST_EXPECT_TRUE(element.m_platform == "es3");
+                UNIT_TEST_EXPECT_TRUE(element.m_platform == "android");
             }
         }
 
         // original products must no longer exist since it should have found and deleted them!
-        for (QString outFile: oldes3outs)
+        for (QString outFile: oldandroidouts)
         {
             UNIT_TEST_EXPECT_FALSE(QFile::exists(outFile));
         }
@@ -1145,11 +1147,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // pc and es3
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // pc and android
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1169,12 +1171,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1205,11 +1207,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1220,12 +1222,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1243,9 +1245,9 @@ namespace AssetProcessor
 
         // deleting the fingerprint file should not have erased the products
         UNIT_TEST_EXPECT_TRUE(QFile::exists(pcouts[0]));
-        UNIT_TEST_EXPECT_TRUE(QFile::exists(es3outs[0]));
+        UNIT_TEST_EXPECT_TRUE(QFile::exists(androidouts[0]));
         UNIT_TEST_EXPECT_TRUE(QFile::exists(pcouts2[0]));
-        UNIT_TEST_EXPECT_TRUE(QFile::exists(es3outs2[0]));
+        UNIT_TEST_EXPECT_TRUE(QFile::exists(androidouts2[0]));
 
         changedInputResults.clear();
         assetMessages.clear();
@@ -1304,9 +1306,9 @@ namespace AssetProcessor
         }
 
         UNIT_TEST_EXPECT_FALSE(QFile::exists(pcouts[0]));
-        UNIT_TEST_EXPECT_FALSE(QFile::exists(es3outs[0]));
+        UNIT_TEST_EXPECT_FALSE(QFile::exists(androidouts[0]));
         UNIT_TEST_EXPECT_FALSE(QFile::exists(pcouts2[0]));
-        UNIT_TEST_EXPECT_FALSE(QFile::exists(es3outs2[0]));
+        UNIT_TEST_EXPECT_FALSE(QFile::exists(androidouts2[0]));
 
         changedInputResults.clear();
         assetMessages.clear();
@@ -1321,28 +1323,28 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
 
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
 
         // send both done messages simultaneously!
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         // send one failure only for PC :
@@ -1420,12 +1422,12 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 3);
         UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 3);
 
-        // which should be for the ES3:
+        // which should be for the ANDROID:
         UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(changedInputResults[0].first) == absolutePath);
 
         // always RELATIVE, always with the product name.
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefilea.arc1" || assetMessages[0].m_data == "basefilea.azm");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
 
         for (auto& payload : payloadList)
         {
@@ -1526,28 +1528,28 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
 
-        es3outs.clear();
-        es3outs2.clear();
+        androidouts.clear();
+        androidouts2.clear();
         pcouts.clear();
         pcouts2.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefilez.arc2")));
-        es3outs2.push_back(cacheRoot.filePath(QString("es3/basefileaz.azm2")));
-        // note that the ES3 outs have changed
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefilez.arc2")));
+        androidouts2.push_back(cacheRoot.filePath(QString("android/basefileaz.azm2")));
+        // note that the android outs have changed
         // but the pc outs are still the same.
         pcouts.push_back(cacheRoot.filePath(QString("pc/basefile.arc2")));
         pcouts2.push_back(cacheRoot.filePath(QString("pc/basefile.azm2")));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
         changedInputResults.clear();
         assetMessages.clear();
@@ -1555,12 +1557,12 @@ namespace AssetProcessor
         // send all the done messages simultaneously:
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1620,11 +1622,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1645,9 +1647,9 @@ namespace AssetProcessor
         absolutePath = watchFolderPath + "/" + relativePathFromWatchFolder;
 
         unsigned int fingerprintForPC = 0;
-        unsigned int fingerprintForES3 = 0;
+        unsigned int fingerprintForANDROID = 0;
 
-        ComputeFingerprints(fingerprintForPC, fingerprintForES3, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(fingerprintForPC, fingerprintForANDROID, config, watchFolderPath, relativePathFromWatchFolder);
 
         processResults.clear();
         QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, absolutePath));
@@ -1655,11 +1657,11 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and es3,since we have two recognizer for .xxx file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and android,since we have two recognizer for .xxx file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
@@ -1681,11 +1683,11 @@ namespace AssetProcessor
         // we never actually submitted any fingerprints or indicated success, so the same number of jobs should occur as before
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and es3,since we have two recognizer for .xxx file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and android,since we have two recognizer for .xxx file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
@@ -1705,7 +1707,7 @@ namespace AssetProcessor
         // now re-perform the same test, this time only the pc ones should re-appear.
         // this should happen because we're changing the extra params, which should be part of the fingerprint
         // if this unit test fails, check to make sure that the extra params are being ingested into the fingerprint computation functions
-        // and also make sure that the jobs that are for the remaining es3 platform don't change.
+        // and also make sure that the jobs that are for the remaining android platform don't change.
 
         // store the UUID so that we can insert the new one with the same UUID
         AZStd::shared_ptr<InternalMockBuilder> builderTxt2Builder;
@@ -1743,12 +1745,12 @@ namespace AssetProcessor
         // ---------------------
 
         unsigned int newfingerprintForPC = 0;
-        unsigned int newfingerprintForES3 = 0;
+        unsigned int newfingerprintForANDROID = 0;
 
-        ComputeFingerprints(newfingerprintForPC, newfingerprintForES3, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(newfingerprintForPC, newfingerprintForANDROID, config, watchFolderPath, relativePathFromWatchFolder);
 
         UNIT_TEST_EXPECT_TRUE(newfingerprintForPC != fingerprintForPC);//Fingerprints should be different
-        UNIT_TEST_EXPECT_TRUE(newfingerprintForES3 == fingerprintForES3);//Fingerprints are same
+        UNIT_TEST_EXPECT_TRUE(newfingerprintForANDROID == fingerprintForANDROID);//Fingerprints are same
 
         config.RemoveRecognizer("xxx files 2 (builder2)");
         mockAppManager.UnRegisterAssetRecognizerAsBuilder("xxx files 2 (builder2)");
@@ -1763,18 +1765,18 @@ namespace AssetProcessor
         absolutePath = AssetUtilities::NormalizeFilePath(absolutePath);
         QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, absolutePath));
         UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // pc and es3
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // pc and android
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier != processResults[1].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
 
         unsigned int newfingerprintForPCAfterVersionChange = 0;
-        unsigned int newfingerprintForES3AfterVersionChange = 0;
+        unsigned int newfingerprintForANDROIDAfterVersionChange = 0;
 
-        ComputeFingerprints(newfingerprintForPCAfterVersionChange, newfingerprintForES3AfterVersionChange, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(newfingerprintForPCAfterVersionChange, newfingerprintForANDROIDAfterVersionChange, config, watchFolderPath, relativePathFromWatchFolder);
 
         UNIT_TEST_EXPECT_TRUE((newfingerprintForPCAfterVersionChange != fingerprintForPC) || (newfingerprintForPCAfterVersionChange != newfingerprintForPC));//Fingerprints should be different
-        UNIT_TEST_EXPECT_TRUE((newfingerprintForES3AfterVersionChange != fingerprintForES3) || (newfingerprintForES3AfterVersionChange != newfingerprintForES3));//Fingerprints should be different
+        UNIT_TEST_EXPECT_TRUE((newfingerprintForANDROIDAfterVersionChange != fingerprintForANDROID) || (newfingerprintForANDROIDAfterVersionChange != newfingerprintForANDROID));//Fingerprints should be different
 
         //------Test for Files which are excluded
         processResults.clear();
@@ -1919,7 +1921,7 @@ namespace AssetProcessor
 
         UNIT_TEST_EXPECT_TRUE(processResults.size() == 0); // nothing to process
 
-        // we are aware that 4 products went missing (es3 and pc versions of the 2 files since we renamed the SOURCE folder)
+        // we are aware that 4 products went missing (android and pc versions of the 2 files since we renamed the SOURCE folder)
         UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 4);
         for (auto element : assetMessages)
         {
@@ -2178,8 +2180,8 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(assetMessages[2].m_assetId != AZ::Data::AssetId());
         UNIT_TEST_EXPECT_TRUE(assetMessages[3].m_assetId != AZ::Data::AssetId());
 
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[2].m_platform == "pc");
         UNIT_TEST_EXPECT_TRUE(assetMessages[3].m_platform == "pc");
 
@@ -2212,12 +2214,12 @@ namespace AssetProcessor
         mockAppManager.UnRegisterAllBuilders();
 
         AssetRecognizer abt_rec1;
-        AssetPlatformSpec abt_speces3;
+        AssetPlatformSpec abt_specandroid;
         abt_rec1.m_name = "UnitTestTextBuilder1";
         abt_rec1.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         //abt_rec1.m_regexp.setPatternSyntax(QRegExp::Wildcard);
         //abt_rec1.m_regexp.setPattern("*.txt");
-        abt_rec1.m_platformSpecs.insert("es3", speces3);
+        abt_rec1.m_platformSpecs.insert("android", specandroid);
         mockAppManager.RegisterAssetRecognizerAsBuilder(abt_rec1);
 
         AssetRecognizer abt_rec2;
@@ -2266,8 +2268,8 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // 1 for pc and es3
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3");
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // 1 for pc and android
+        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android");
         UNIT_TEST_EXPECT_TRUE(processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc");
         UNIT_TEST_EXPECT_TRUE(QString::compare(processResults[0].m_jobEntry.GetAbsoluteSourcePath(), absolutePath, Qt::CaseInsensitive) == 0);
         UNIT_TEST_EXPECT_TRUE(QString::compare(processResults[1].m_jobEntry.GetAbsoluteSourcePath(), absolutePath, Qt::CaseInsensitive) == 0);
diff --git a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
index 29a0570d39..992cf09539 100644
--- a/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp
@@ -17,16 +17,16 @@ void ConnectionUnitTest::StartTest()
     m_testConnection.SetAssetPlatformsString("pc");
     AzFramework::AssetSystem::AssetNotificationMessage testMessage;
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
-    m_testConnection.SendPerPlatform(0, testMessage, "osx_gl");
+    m_testConnection.SendPerPlatform(0, testMessage, "mac");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
     m_testConnection.SendPerPlatform(0, testMessage, "pc");
-    m_testConnection.SetAssetPlatformsString("pc,es3");
+    m_testConnection.SetAssetPlatformsString("pc,android");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
     m_testConnection.SendPerPlatform(0, testMessage, "pc");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
-    m_testConnection.SendPerPlatform(0, testMessage, "osx_gl");
+    m_testConnection.SendPerPlatform(0, testMessage, "mac");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
-    m_testConnection.SendPerPlatform(0, testMessage, "es3");
+    m_testConnection.SendPerPlatform(0, testMessage, "android");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
     // Intended partial string match test - shouldn't send
     m_testConnection.SendPerPlatform(0, testMessage, "es");
diff --git a/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h b/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
index f0553d5e84..75ffdfe218 100644
--- a/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
+++ b/Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h
@@ -63,7 +63,7 @@ namespace AssetProcessor
 
         size_t SendPerPlatform(unsigned int serial, const AzFramework::AssetSystem::BaseAssetProcessorMessage& message, const QString& platform) override
         {
-            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "es3", Qt::CaseInsensitive) == 0)
+            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "android", Qt::CaseInsensitive) == 0)
             {
                 return Send(serial, message);
             }
@@ -72,7 +72,7 @@ namespace AssetProcessor
 
         size_t SendRawPerPlatform(unsigned int type, unsigned int serial, const QByteArray& data, const QString& platform) override
         {
-            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "es3", Qt::CaseInsensitive) == 0)
+            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "android", Qt::CaseInsensitive) == 0)
             {
                 return SendRaw(type, serial, data);
             }
diff --git a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
index e09a6366a1..ff29cf2ca9 100644
--- a/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp
@@ -64,7 +64,7 @@ void PlatformConfigurationTests::StartTest()
 
         PlatformConfiguration config;
         config.EnablePlatform({ "pc",{ "desktop", "host" } }, true);
-        config.EnablePlatform({ "es3",{ "mobile", "android" } }, true);
+        config.EnablePlatform({ "android",{ "mobile", "android" } }, true);
         config.EnablePlatform({ "fandago",{ "console" } }, false);
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
@@ -88,15 +88,15 @@ void PlatformConfigurationTests::StartTest()
 
         AssetRecognizer rec;
         AssetPlatformSpec specpc;
-        AssetPlatformSpec speces3;
+        AssetPlatformSpec specandroid;
         AssetPlatformSpec specfandago; 
         specpc.m_extraRCParams = ""; // blank must work
-        speces3.m_extraRCParams = "testextraparams";
+        specandroid.m_extraRCParams = "testextraparams";
 
         rec.m_name = "txt files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         rec.m_platformSpecs.insert("fandago", specfandago); 
         config.AddRecognizer(rec);
 
@@ -111,7 +111,7 @@ void PlatformConfigurationTests::StartTest()
 
         UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms().size() == 2);
         UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[0].m_identifier == "pc");
-        UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[1].m_identifier == "es3");
+        UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[1].m_identifier == "android");
 
         UNIT_TEST_EXPECT_TRUE(config.GetScanFolderCount() == 11);
         UNIT_TEST_EXPECT_FALSE(config.GetScanFolderAt(0).IsRoot());
diff --git a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
index 0e771f7fd1..02b98e5e33 100644
--- a/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp
@@ -239,14 +239,14 @@ void RCcontrollerUnitTests::RunRCControllerTests()
         createdJobs.push_back(job);
     }
 
-    // double them up for "es3" to make sure that platform is respected
+    // double them up for "android" to make sure that platform is respected
     for (QString name : tempJobNames)
     {
         AZ::Uuid uuidOfSource = AZ::Uuid::CreateName(name.toUtf8().constData());
         RCJob* job0 = new RCJob(rcJobListModel);
         AssetProcessor::JobDetails jobDetails;
         jobDetails.m_jobEntry.m_databaseSourceName = jobDetails.m_jobEntry.m_pathRelativeToWatchFolder = name;
-        jobDetails.m_jobEntry.m_platformInfo = { "es3" ,{ "mobile", "renderer" } };
+        jobDetails.m_jobEntry.m_platformInfo = { "android" ,{ "mobile", "renderer" } };
         jobDetails.m_jobEntry.m_jobKey = "Compile Other Stuff";
         jobDetails.m_jobEntry.m_sourceFileUUID = uuidOfSource;
         job0->Init(jobDetails);
@@ -490,7 +490,7 @@ void RCcontrollerUnitTests::RunRCControllerTests()
     UNIT_TEST_EXPECT_FALSE(gotJobsInQueueCall);
 
     // submit same job but different platform:
-    details.m_jobEntry = JobEntry("d:/test", "test1.txt", "test1.txt", AZ::Uuid("{7954065D-CFD1-4666-9E4C-3F36F417C7AC}"), { "es3" ,{ "mobile", "renderer" } }, "Test Job", 1234, 3, sourceId);
+    details.m_jobEntry = JobEntry("d:/test", "test1.txt", "test1.txt", AZ::Uuid("{7954065D-CFD1-4666-9E4C-3F36F417C7AC}"), { "android" ,{ "mobile", "renderer" } }, "Test Job", 1234, 3, sourceId);
     m_rcController.JobSubmitted(details);
     QCoreApplication::processEvents(QEventLoop::AllEvents);
 
diff --git a/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
index 1e10002b53..650f3120dd 100644
--- a/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
+++ b/Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp
@@ -54,7 +54,7 @@ namespace UnitTestUtils
 {
     void SleepForMinimumFileSystemTime()
     {
-        // note that on OSX, the file system has a resolution of 1 second, and since we're using modtime for a bunch of things, 
+        // note that on Mac, the file system has a resolution of 1 second, and since we're using modtime for a bunch of things, 
         // not the actual hash files, we have to wait different amount depending on the OS.
 #ifdef AZ_PLATFORM_WINDOWS
         int milliseconds = 1;
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
index c85801a074..579c7f93d3 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
@@ -622,13 +622,14 @@ bool ApplicationManager::Activate()
 {
     if (!AssetUtilities::ComputeAssetRoot(m_systemRoot))
     {
+        AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to compute the asset root for the project, this application cannot launch until this is fixed.");
         return false;
     }
 
     auto projectName = AssetUtilities::ComputeProjectName();
     if (projectName.isEmpty())
     {
-        AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to detect name of current game project.  Is bootstrap.cfg appropriately configured?");
+        AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to detect name of current game project. Configure your game project name to launch this application.");
         return false;
     }
 
diff --git a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
index a17819bba2..7c4f429da4 100644
--- a/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
+++ b/Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
@@ -1191,6 +1191,7 @@ bool ApplicationManagerBase::Activate()
     QDir projectCache;
     if (!AssetUtilities::ComputeProjectCacheRoot(projectCache))
     {
+        AZ_Error("AssetProcessor", false, "Could not compute project cache root, please configure your project correctly to launch Asset Processor.");
         return false;
     }
 
@@ -1200,22 +1201,27 @@ bool ApplicationManagerBase::Activate()
     // Shutdown if the disk has less than 128MB of free space
     if (!CheckSufficientDiskSpace(projectCache.absolutePath(), 128 * 1024 * 1024, true))
     {
+        // CheckSufficientDiskSpace reports an error if disk space is low.
         return false;
     }
 
     bool appInited = InitApplicationServer();
     if (!appInited)
     {
+        AZ_Error(
+            "AssetProcessor", false, "InitApplicationServer failed, something internal to Asset Processor has failed, please report this to support if you encounter this error.");
         return false;
     }
 
     if (!InitAssetDatabase())
     {
+        // AssetDatabaseConnection::OpenDatabase reports any errors it encounters.
         return false;
     }
 
     if (!ApplicationManager::Activate())
     {
+        // ApplicationManager::Activate() reports any errors it encounters.
         return false;
     }
 
@@ -1230,6 +1236,7 @@ bool ApplicationManagerBase::Activate()
     m_isCurrentlyLoadingGems = true;
     if (!ActivateModules())
     {
+        // ActivateModules reports any errors it encounters.
         m_isCurrentlyLoadingGems = false;
         return false;
     }
@@ -1299,6 +1306,7 @@ bool ApplicationManagerBase::Activate()
     {
         if (!m_applicationServer->startListening())
         {
+            // startListening reports any errors it encounters.
             return false;
         }
     }
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
index 468ab68f5d..05ed19cb74 100644
--- a/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg
@@ -5,11 +5,11 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platforms": {
-                    "es3": "enabled"
+                    "android": "enabled"
                 },
                 "ScanFolder Game": {
                     "watch": "@PROJECTROOT@",
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
index 507fe4afb1..23f5725548 100644
--- a/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg
@@ -5,7 +5,7 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "RC i_caf": {
diff --git a/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
index 0e687062b2..32c0af0593 100644
--- a/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg
@@ -5,7 +5,7 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "ScanFolder Game": {
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
index 1c5c487a46..c43996f3d5 100644
--- a/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg
@@ -5,17 +5,17 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platform server": {
                     "tags": "server"
                 },
                 "Platforms": {
-                    "es3": "enabled",
+                    "android": "enabled",
                     "server": "enabled"
                 },
                 "Jobs": {
@@ -56,7 +56,7 @@
                     "glob": "*.i_caf",
                     "params": "defaultparams",
                     "server": "skip",
-                    "es3": "mobile",
+                    "android": "mobile",
                     "priority": 5,
                     "checkServer": true
                 },
@@ -68,7 +68,7 @@
                 "RC mov": {
                     "glob": "*.mov",
                     "params": "copy",
-                    "es3": "platformspecificoverride",
+                    "android": "platformspecificoverride",
                     "renderer": "rendererparams"
                 },
                 "RC rend": {
diff --git a/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg b/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
index e1c2d6e8cc..5fe1071fd5 100644
--- a/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
+++ b/Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg
@@ -5,13 +5,13 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer"
                 },
                 "Platform ios": {
                     "tags": "mobile,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platform server": {
@@ -21,7 +21,7 @@
                     "tags": "console,renderer"
                 },
                 "Platforms": {
-                    "es3": "enabled",
+                    "android": "enabled",
                     "ios": "enabled",
                     "server": "enabled"
                 },
@@ -54,14 +54,14 @@
                     "display": "folder1output",
                     "recursive": 1,
                     "order": 50000,
-                    "include": "es3"
+                    "include": "android"
                 },
                 "ScanFolder Folder2": {
                     "watch": "@ENGINEROOT@/Folder2",
                     "display": "folder2output",
                     "recursive": 1,
                     "order": 60000,
-                    "exclude": "es3"
+                    "exclude": "android"
                 },
                 "ScanFolder Folder3": {
                     "watch": "@ENGINEROOT@/Folder3",
@@ -80,7 +80,7 @@
                     "glob": "*.i_caf",
                     "params": "defaultparams",
                     "server": "skip",
-                    "es3": "mobile",
+                    "android": "mobile",
                     "test": "copy",
                     "priority": 5
                 },
@@ -92,7 +92,7 @@
                 "RC mov": {
                     "glob": "*.mov",
                     "params": "copy",
-                    "es3": "platformspecificoverride",
+                    "android": "platformspecificoverride",
                     "renderer": "rendererparams"
                 },
                 "RC rend": {
diff --git a/Code/Tools/DeltaCataloger/Tests/tests_main.cpp b/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
index 67d6767a17..887889edcb 100644
--- a/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
+++ b/Code/Tools/DeltaCataloger/Tests/tests_main.cpp
@@ -13,6 +13,7 @@
 #include <AzTest/AzTest.h>
 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/string/string.h>
 #include <AzFramework/Asset/AssetBundleManifest.h>
@@ -45,6 +46,12 @@ public:
 protected:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         AZ::ComponentApplication::Descriptor desc;
         desc.m_useExistingAllocator = true;
         desc.m_enableDrilling = false; // we already created a memory driller for the test (AllocatorsFixture)
diff --git a/Code/Tools/GridHub/GridHub/gridhub.cpp b/Code/Tools/GridHub/GridHub/gridhub.cpp
index 7f85ade238..4b2d8e425b 100644
--- a/Code/Tools/GridHub/GridHub/gridhub.cpp
+++ b/Code/Tools/GridHub/GridHub/gridhub.cpp
@@ -552,7 +552,7 @@ GridHubComponent::OnMemberJoined([[maybe_unused]] GridMate::GridSession* session
     switch( member->GetPlatformId() )
     {
     case AZ::PlatformID::PLATFORM_WINDOWS_64:
-    case AZ::PlatformID::PLATFORM_APPLE_OSX:
+    case AZ::PlatformID::PLATFORM_APPLE_MAC:
         {
             GridMate::string localMachineName = GridMate::Utils::GetMachineAddress();
             if( member->GetMachineName() == localMachineName )
diff --git a/Code/Tools/ProjectManager/Resources/AddOffset.svg b/Code/Tools/ProjectManager/Resources/AddOffset.svg
new file mode 100644
index 0000000000..4c62234070
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/AddOffset.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="64" viewBox="0 0 24 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,40)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H11V11H3V13H11V21H13V13H21V11H13V3Z" fill="white"/>
+</g>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/AddOffset_Hover.svg b/Code/Tools/ProjectManager/Resources/AddOffset_Hover.svg
new file mode 100644
index 0000000000..a0e2a07eda
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/AddOffset_Hover.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="64" viewBox="0 0 24 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,40)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3H11V11H3V13H11V21H13V13H21V11H13V3Z" fill="#1e70eb"/>
+</g>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/ArrowBack.svg b/Code/Tools/ProjectManager/Resources/ArrowBack.svg
new file mode 100644
index 0000000000..749bb5a02e
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/ArrowBack.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.02554 10L9 15.0362V18L0 9L9 0V2.98885L4 8H18V10H4.02554Z" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/FolderOffset.svg b/Code/Tools/ProjectManager/Resources/FolderOffset.svg
new file mode 100644
index 0000000000..a048fbcc39
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/FolderOffset.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="64" viewBox="0 0 24 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,40)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.98407 4H2V6V7V19.8145H2.07539L6.02059 7.99123H19V6H11.328L9.98407 4ZM19 19.7473L22.0766 10H7.05436L3.68763 19.8329H18.973L18.9788 19.8145H19V19.7473Z" fill="white"/>
+</g>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/FolderOffset_Hover.svg b/Code/Tools/ProjectManager/Resources/FolderOffset_Hover.svg
new file mode 100644
index 0000000000..fb13cd8558
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/FolderOffset_Hover.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="64" viewBox="0 0 24 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(0,40)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.98407 4H2V6V7V19.8145H2.07539L6.02059 7.99123H19V6H11.328L9.98407 4ZM19 19.7473L22.0766 10H7.05436L3.68763 19.8329H18.973L18.9788 19.8145H19V19.7473Z" fill="#1e70eb"/>
+</g>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
index ac55c48a6b..04d5e98a10 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qrc
@@ -4,6 +4,12 @@
     </qresource>
     <qresource prefix="/">
         <file>Add.svg</file>
+        <file>AddOffset.svg</file>
+        <file>AddOffset_Hover.svg</file>
+        <file>ArrowBack.svg</file>
+        <file>build.svg</file>
+        <file>FolderOffset.svg</file>
+        <file>FolderOffset_Hover.svg</file>
         <file>Select_Folder.svg</file>
         <file>o3de_editor.ico</file>
         <file>Windows.svg</file>
@@ -14,6 +20,11 @@
         <file>DefaultProjectImage.png</file>
         <file>ArrowDownLine.svg</file>
         <file>ArrowUpLine.svg</file>
+        <file>o3de.svg</file>
+        <file>menu.svg</file>
+        <file>menu_hover.svg</file>
         <file>Backgrounds/FirstTimeBackgroundImage.jpg</file>
+        <file>ArrowDownLine.svg</file>
+        <file>ArrowUpLine.svg</file>
     </qresource>
 </RCC>
diff --git a/Code/Tools/ProjectManager/Resources/ProjectManager.qss b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
index 16ef48ee7c..5eb92964dd 100644
--- a/Code/Tools/ProjectManager/Resources/ProjectManager.qss
+++ b/Code/Tools/ProjectManager/Resources/ProjectManager.qss
@@ -1,29 +1,69 @@
 /************** General (MainWindow) **************/
 QMainWindow {
-    background-color: #333333;
+    background:#131313 url(:/o3de.svg) no-repeat top left;
+    /* position the logo using padding and background-origin, Qt does not support background-position pixels */
+    background-origin:content;
+    padding:25px 16px;
+    margin:0;
 }
 
-
 QPushButton:focus {
     outline: none;
     border:1px solid #1e70eb;
 }
 
+QTabBar {
+    background-color: transparent;
+}
+QTabWidget::tab-bar
+{
+    left: 78px; /* make room for the logo */
+}
+QTabBar::tab {
+    height:82px;
+    background-color: transparent;
+    font-size:24px;
+    min-width:100px;
+    margin-right:40px;
+    border-bottom: 3px solid transparent;
+}
+QTabBar::tab:text
+{
+    text-align:left;
+}
+QTabWidget::pane {
+    background-color: #333333;
+    border:0 none;
+}
+QTabBar::tab:selected
+{
+    border-bottom: 3px solid #1e70eb;
+    color: #1e70eb;
+}
+QTabBar::tab:hover
+{
+    color: #1e70eb;
+}
+QTabBar::tab:pressed
+{
+    color: #0e60eb;
+}
+
 /************** General (Forms) **************/
 
 #formLineEditWidget,
 #formBrowseEditWidget {
-    max-width: 780px;
+    max-width: 890px;
 }
 
 #formFrame {
-    max-width: 720px;
+    max-width: 840px;
     background-color: #444444;
     border:1px solid #dddddd;
     border-radius: 4px;
     padding: 0px 10px 2px 6px;
     margin-top:10px;
-    margin-left:30px;
+    margin-left:50px;
 }
 
 #formFrame[Focus="true"] {
@@ -59,15 +99,241 @@ QPushButton:focus {
     padding-top: -4px;
 }
 
+
 #formErrorLabel {
     color: #ec3030;
     font-size: 14px;
-    margin-left: 40px;
+    margin-left: 50px;
 }
 
 #formTitleLabel {
     font-size:21px;
     color:#ffffff;
-    margin: 10px 0 10px 30px;
+    margin: 24px 0 10px 50px;
 }
 
+/************** General (Modal windows) **************/
+
+#header {
+	background-color:#111111;
+    min-height:80px;
+    max-height:80px;
+}
+
+#header QPushButton {
+    /* settings min/max lets us use a fixed size */
+    min-width: 24px;
+    max-width: 24px;
+    min-height: 24px;
+    max-height: 24px;
+    margin: 20px 10px 0px 10px;
+    background:transparent url(:/ArrowBack.svg) no-repeat center;
+    background-origin:content;
+    qproperty-flat: true;
+    qproperty-iconSize: 50px;
+}
+
+#header QPushButton:focus {
+    border:none;
+}
+#header QPushButton:hover {
+    background:#333333 url(:/ArrowBack.svg) no-repeat center;
+}
+#header QPushButton:pressed {
+    background:#222222 url(:/ArrowBack.svg) no-repeat center;
+}
+
+#headerTitle {
+    font-size:14px;
+    text-align:left;
+    margin:0;
+    padding-top:10px;
+    padding-bottom:-5px;
+    min-height:15px;
+    max-height:15px;
+}
+#headerSubTitle {
+    font-size:24px;
+    text-align:left;
+    margin:0;
+    min-height:42px;
+    max-height:42px;
+}
+
+#body {
+    background-color:#333333;
+}
+#footer {
+    /* settings min/max lets us use a fixed size */
+    min-width: 50px;
+    min-height:54px;
+    max-height:54px;
+}
+
+#footer > QPushButton {
+    qproperty-flat: true;
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #0095f2, stop: 1.0 #1e70eb);
+    border-radius: 3px;
+    min-height: 28px;
+    max-height: 28px;
+    min-width: 150px;
+    margin-right:30px;
+}
+#footer > QPushButton:hover {
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #10A5f2, stop: 1.0 #2e80eb);
+}
+#footer > QPushButton:pressed {
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #0085e2, stop: 1.0 #0e60db);
+}
+
+#footer > QPushButton[secondary="true"] {
+    margin-right: 10px;
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #888888, stop: 1.0 #555555);
+}
+#footer > QPushButton[secondary="true"]:hover {
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #999999, stop: 1.0 #666666);
+}
+#footer > QPushButton[secondary="true"]:pressed {
+	background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+							stop: 0 #555555, stop: 1.0 #777777);
+}
+
+/************** Project Settings **************/
+#projectSettings {
+    margin-top:42px;
+}
+
+#projectTemplate {
+    margin: 55px 0 0 50px;
+    max-width: 780px;
+    min-height:200px;
+    max-height:200px;
+}
+#projectTemplateLabel {
+    font-size:16px;
+    font-weight:100;
+}
+
+#projectTemplateDetailsLabel {
+    font-size:14px;
+    min-height:40px;
+    margin-bottom:20px;
+}
+
+#projectTemplateDetails {
+    background-color:#444444;
+    max-width:240px;
+    min-width:240px;
+    margin-left:30px;
+}
+
+/************** Projects **************/
+#firstTimeContent > #titleLabel {
+    font-size:60px;
+    margin:73px 0px 0px 0px;
+    qproperty-indent: 0;
+}
+
+#firstTimeContent > #introLabel {
+    font-size:14px;
+    margin:10px 0 60px 0;
+    qproperty-indent: 0;
+}
+
+#firstTimeContent > QPushButton {
+    min-width: 210px;
+    max-width: 210px;
+    min-height: 276px;
+    max-height: 276px;
+    qproperty-flat: true;
+    background-origin:content;
+    font-size:14px;
+    border: 1px solid #ffffff;
+}
+
+#firstTimeContent > QPushButton:hover {
+    border: 1px solid #1e70eb;
+    color: #1e70eb;
+}
+
+#firstTimeContent > QPushButton:pressed {
+    border: 1px solid #0e60eb;
+    color: #0e60eb;
+}
+
+#createProjectButton {
+    background:rgba(0,0,0,180) url(:/AddOffset.svg) no-repeat center center;
+}
+#createProjectButton:hover,
+#createProjectButton:pressed {
+    background:rgba(0,0,0,180) url(:/AddOffset_Hover.svg) no-repeat center center;
+}
+
+#addProjectButton {
+    background:rgba(0,0,0,180) url(:/FolderOffset.svg) no-repeat center center;
+}
+#addProjectButton:hover,
+#addProjectButton:pressed {
+    background:rgba(0,0,0,180) url(:/FolderOffset_Hover.svg) no-repeat center center;
+}
+
+#projectsContent > QFrame  {
+    margin-top:60px;
+}
+
+#projectsContent > QFrame > #titleLabel {
+    font-size:24px;
+    qproperty-indent: 0;
+}
+
+#projectsContent > QScrollArea {
+    margin-top:40px;
+    margin-bottom:5px;
+}
+
+#projectButton > #labelButton  {
+    border:1px solid white;
+}
+#projectButton > #labelButton:hover,
+#projectButton > #labelButton:pressed  {
+    border:1px solid #1e70eb;
+}
+
+#projectButton > QFrame  {
+    margin-top:6px;
+}
+
+#projectButton > QFrame > QLabel {
+    font-weight:bold;
+    font-size:14px;
+    qproperty-indent: 0;
+}
+
+#projectMenuButton {
+    qproperty-flat: true;
+    background:transparent url(:/menu.svg) no-repeat center center;
+    max-width:30px;
+    min-width:30px;
+    max-height:14px;
+    min-height:14px;
+}
+
+#projectsContent > QFrame > #newProjectButton {
+    min-width:150px;
+    max-width:150px;
+    min-height:26px;
+    max-height:26px;
+}
+
+#labelButtonOverlay {
+    background-color: rgba(50,50,50,200);
+    min-width:210px;
+    max-width:210px;;
+    min-height:278px;
+    max-height:278px;
+}
\ No newline at end of file
diff --git a/Code/Tools/ProjectManager/Resources/build.svg b/Code/Tools/ProjectManager/Resources/build.svg
new file mode 100644
index 0000000000..b6c3546443
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/build.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="16" width="5" height="5" fill="white"/>
+<rect x="9.5" y="16" width="5" height="5" fill="white"/>
+<rect x="16" y="16" width="5" height="5" fill="white"/>
+<rect x="3" y="9.5" width="5" height="5" fill="white"/>
+<rect x="9.5" y="9.5" width="5" height="5" fill="white"/>
+<rect x="19.415" y="8.58496" width="5" height="5" transform="rotate(60 19.415 8.58496)" fill="white"/>
+<rect x="3" y="3" width="5" height="5" fill="white"/>
+<rect x="8.58496" y="6.41504" width="5" height="5" transform="rotate(-60 8.58496 6.41504)" fill="white"/>
+<rect x="19.5" y="0.964844" width="5" height="5" transform="rotate(45 19.5 0.964844)" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/menu.svg b/Code/Tools/ProjectManager/Resources/menu.svg
new file mode 100644
index 0000000000..a639c74ab4
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/menu.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="16" viewBox="0 0 24 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.3335" y="2.66675" width="13.3333" height="1.33333" fill="white"/>
+<rect x="1.3335" y="7.33325" width="13.3333" height="1.33333" fill="white"/>
+<rect x="1.3335" y="12" width="13.3333" height="1.33333" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/menu_hover.svg b/Code/Tools/ProjectManager/Resources/menu_hover.svg
new file mode 100644
index 0000000000..4eea63faca
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/menu_hover.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="16" viewBox="0 0 24 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.3335" y="2.66675" width="13.3333" height="1.33333" fill="#1e70eb"/>
+<rect x="1.3335" y="7.33325" width="13.3333" height="1.33333" fill="#1e70eb"/>
+<rect x="1.3335" y="12" width="13.3333" height="1.33333" fill="#1e70eb"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/o3de.svg b/Code/Tools/ProjectManager/Resources/o3de.svg
new file mode 100644
index 0000000000..bb6e596a00
--- /dev/null
+++ b/Code/Tools/ProjectManager/Resources/o3de.svg
@@ -0,0 +1,3 @@
+<svg width="38" height="32" viewBox="0 0 38 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.0335 27.6364C30.2006 30.4503 26.4498 32 22.4729 32H22.4719L22.4007 31.9999C18.3948 31.9813 14.6226 30.396 11.7792 27.5358C7.98134 23.7148 6.67845 18.3374 7.86239 13.445H13.291C12.8522 14.5772 12.6238 15.7937 12.6313 17.0465C12.6466 19.6692 13.682 22.1248 15.5465 23.9605C17.4134 25.7987 19.8692 26.811 22.462 26.811L22.4897 26.8108C25.0998 26.8025 27.555 25.7736 29.4067 23.9136C31.2794 22.0326 32.3023 19.5505 32.2872 16.9246C32.2718 14.2963 31.2187 11.8234 29.3215 9.96131C27.4791 8.153 25.0581 7.16098 22.4942 7.16098C22.4558 7.16098 22.4177 7.16127 22.379 7.16171C20.9514 7.17701 19.5695 7.49947 18.3061 8.09355V2.5551C19.6438 2.16896 21.0401 1.96569 22.4658 1.96569L22.5394 1.96598C26.5556 1.98507 30.3331 3.58486 33.1758 6.47058C35.976 9.31332 37.5035 13.0777 37.4771 17.0703C37.4508 21.0641 35.8727 24.8164 33.0335 27.6364ZM1.73437 2.98423H4.71974V0H1.73437V2.98423ZM0 11.9513H4.68388V7.26925H0V11.9513ZM7.65831 10.0451H14.8796V2.82656H7.65831V10.0451Z" fill="white"/>
+</svg>
diff --git a/Code/Tools/ProjectManager/Resources/o3de_editor.ico b/Code/Tools/ProjectManager/Resources/o3de_editor.ico
index 0680ceea19..e7b77c35bf 100644
--- a/Code/Tools/ProjectManager/Resources/o3de_editor.ico
+++ b/Code/Tools/ProjectManager/Resources/o3de_editor.ico
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a
-size 107016
+oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
+size 106449
diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
index 03e6a34b89..69f0a3983d 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
@@ -14,11 +14,17 @@
 #include <ScreensCtrl.h>
 #include <PythonBindingsInterface.h>
 #include <NewProjectSettingsScreen.h>
+#include <ScreenHeaderWidget.h>
+#include <GemCatalog/GemCatalogScreen.h>
 
 #include <QDialogButtonBox>
+#include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QMessageBox>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QSizePolicy>
 
 namespace O3DE::ProjectManager
 {
@@ -26,29 +32,34 @@ namespace O3DE::ProjectManager
         : ScreenWidget(parent)
     {
         QVBoxLayout* vLayout = new QVBoxLayout();
-        setLayout(vLayout);
+        vLayout->setContentsMargins(0,0,0,0);
 
-        m_screensCtrl = new ScreensCtrl();
-        vLayout->addWidget(m_screensCtrl);
+        m_header = new ScreenHeader(this);
+        m_header->setTitle(tr("Create a New Project"));
+        m_header->setSubTitle(tr("Enter Project Details"));
+        connect(m_header->backButton(), &QPushButton::clicked, this, &CreateProjectCtrl::HandleBackButton);
+        vLayout->addWidget(m_header);
+
+        m_stack = new QStackedWidget(this);
+        m_stack->setObjectName("body");
+        m_stack->setSizePolicy(QSizePolicy(QSizePolicy::Preferred,QSizePolicy::Expanding));
+        m_stack->addWidget(new NewProjectSettingsScreen());
+        m_stack->addWidget(new GemCatalogScreen());
+        vLayout->addWidget(m_stack);
 
         QDialogButtonBox* backNextButtons = new QDialogButtonBox();
+        backNextButtons->setObjectName("footer");
         vLayout->addWidget(backNextButtons);
 
         m_backButton = backNextButtons->addButton(tr("Back"), QDialogButtonBox::RejectRole);
+        m_backButton->setProperty("secondary", true);
         m_nextButton = backNextButtons->addButton(tr("Next"), QDialogButtonBox::ApplyRole);
 
-        connect(m_backButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleBackButton);
-        connect(m_nextButton, &QPushButton::pressed, this, &CreateProjectCtrl::HandleNextButton);
+        connect(m_backButton, &QPushButton::clicked, this, &CreateProjectCtrl::HandleBackButton);
+        connect(m_nextButton, &QPushButton::clicked, this, &CreateProjectCtrl::HandleNextButton);
 
-        m_screensOrder =
-        {
-            ProjectManagerScreen::NewProjectSettings,
-            ProjectManagerScreen::GemCatalog
-        };
-        m_screensCtrl->BuildScreens(m_screensOrder);
-        m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::NewProjectSettings, false);
-
-        UpdateNextButtonText();
+        Update();
+        setLayout(vLayout);
     }
 
     ProjectManagerScreen CreateProjectCtrl::GetScreenEnum()
@@ -58,28 +69,20 @@ namespace O3DE::ProjectManager
 
     void CreateProjectCtrl::HandleBackButton()
     {
-        if (!m_screensCtrl->GotoPreviousScreen())
+        if (m_stack->currentIndex() > 0)
         {
-            emit GotoPreviousScreenRequest();
+            m_stack->setCurrentIndex(m_stack->currentIndex() - 1);
+            Update();
         }
         else
         {
-            UpdateNextButtonText();
+            emit GotoPreviousScreenRequest();
         }
     }
     void CreateProjectCtrl::HandleNextButton()
     {
-        ScreenWidget* currentScreen = m_screensCtrl->GetCurrentScreen();
+        ScreenWidget* currentScreen = reinterpret_cast<ScreenWidget*>(m_stack->currentWidget());
         ProjectManagerScreen screenEnum = currentScreen->GetScreenEnum();
-        auto screenOrderIter = m_screensOrder.begin();
-        for (; screenOrderIter != m_screensOrder.end(); ++screenOrderIter)
-        {
-            if (*screenOrderIter == screenEnum)
-            {
-                ++screenOrderIter;
-                break;
-            }
-        }
 
         if (screenEnum == ProjectManagerScreen::NewProjectSettings)
         {
@@ -97,10 +100,10 @@ namespace O3DE::ProjectManager
             }
         }
 
-        if (screenOrderIter != m_screensOrder.end())
+        if (m_stack->currentIndex() != m_stack->count() - 1)
         {
-            m_screensCtrl->ChangeToScreen(*screenOrderIter);
-            UpdateNextButtonText();
+            m_stack->setCurrentIndex(m_stack->currentIndex() + 1);
+            Update();
         }
         else
         {
@@ -108,7 +111,7 @@ namespace O3DE::ProjectManager
             if (result.IsSuccess())
             {
                 // adding gems is not implemented yet because we don't know what targets to add or how to add them
-                emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
+                emit ChangeScreenRequest(ProjectManagerScreen::Projects);
             }
             else
             {
@@ -117,14 +120,21 @@ namespace O3DE::ProjectManager
         }
     }
 
-    void CreateProjectCtrl::UpdateNextButtonText()
+    void CreateProjectCtrl::Update()
     {
-        QString nextButtonText = tr("Next");
-        if (m_screensCtrl->GetCurrentScreen()->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
+        ScreenWidget* currentScreen = reinterpret_cast<ScreenWidget*>(m_stack->currentWidget());
+        if (currentScreen && currentScreen->GetScreenEnum() == ProjectManagerScreen::GemCatalog)
         {
-            nextButtonText = tr("Create Project");
+            m_header->setTitle(tr("Create Project"));
+            m_header->setSubTitle(tr("Configure project with Gems"));
+            m_nextButton->setText(tr("Create Project"));
+        }
+        else
+        {
+            m_header->setTitle(tr("Create Project"));
+            m_header->setSubTitle(tr("Enter Project Details"));
+            m_nextButton->setText(tr("Next"));
         }
-        m_nextButton->setText(nextButtonText);
     }
 
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
index 213bff3bc2..01e3349b21 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.h
@@ -12,15 +12,18 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include "ProjectInfo.h"
 #include <ScreenWidget.h>
-#include <ScreensCtrl.h>
-#include <QPushButton>
+#include <ProjectInfo.h>
 #endif
 
+QT_FORWARD_DECLARE_CLASS(QStackedWidget)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QLabel)
 
 namespace O3DE::ProjectManager
 {
+    QT_FORWARD_DECLARE_CLASS(ScreenHeader)
+
     class CreateProjectCtrl
         : public ScreenWidget
     {
@@ -34,12 +37,13 @@ namespace O3DE::ProjectManager
         void HandleNextButton();
 
     private:
-        void UpdateNextButtonText();
+        void Update();
+
+        QStackedWidget* m_stack;
+        ScreenHeader* m_header;
 
-        ScreensCtrl* m_screensCtrl;
         QPushButton* m_backButton;
         QPushButton* m_nextButton;
-        QVector<ProjectManagerScreen> m_screensOrder;
 
         QString m_projectTemplatePath;
         ProjectInfo m_projectInfo;
diff --git a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
index f51996bd65..6342041da4 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.cpp
@@ -82,6 +82,16 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::EngineSettings;
     }
 
+    QString EngineSettingsScreen::GetTabText()
+    {
+        return tr("Engine");
+    }
+
+    bool EngineSettingsScreen::IsTab()
+    {
+        return true;
+    }
+
     void EngineSettingsScreen::OnTextChanged()
     {
         // save engine settings
diff --git a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
index 0e91ec2d3b..36e329cdf6 100644
--- a/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/EngineSettingsScreen.h
@@ -26,7 +26,10 @@ namespace O3DE::ProjectManager
     public:
         explicit EngineSettingsScreen(QWidget* parent = nullptr);
         ~EngineSettingsScreen() = default;
+
         ProjectManagerScreen GetScreenEnum() override;
+        QString GetTabText() override;
+        bool IsTab() override;
 
     protected slots:
         void OnTextChanged();
diff --git a/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.cpp b/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.cpp
deleted file mode 100644
index 8654b221fb..0000000000
--- a/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include <FirstTimeUseScreen.h>
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QIcon>
-#include <QSpacerItem>
-
-namespace O3DE::ProjectManager
-{
-    FirstTimeUseScreen::FirstTimeUseScreen(QWidget* parent)
-        : ScreenWidget(parent)
-    {
-        QVBoxLayout* vLayout = new QVBoxLayout();
-        setLayout(vLayout);
-        vLayout->setContentsMargins(s_contentMargins, s_contentMargins, s_contentMargins, s_contentMargins);
-
-        QLabel* titleLabel = new QLabel(this);
-        titleLabel->setText(tr("Ready. Set. Create!"));
-        titleLabel->setStyleSheet("font-size: 60px");
-        vLayout->addWidget(titleLabel);
-
-        QLabel* introLabel = new QLabel(this);
-        introLabel->setTextFormat(Qt::AutoText);
-        introLabel->setText(tr("<html><head/><body><p>Welcome to O3DE! Start something new by creating a project. Not sure what to create? </p><p>Explore what\342\200\231s available by downloading our sample project.</p></body></html>"));
-        introLabel->setStyleSheet("font-size: 14px");
-        vLayout->addWidget(introLabel);
-
-        QHBoxLayout* buttonLayout = new QHBoxLayout();
-        buttonLayout->setSpacing(s_buttonSpacing);
-
-        m_createProjectButton = CreateLargeBoxButton(QIcon(":/Add.svg"), tr("Create Project"), this);
-        m_createProjectButton->setIconSize(QSize(s_iconSize, s_iconSize));
-        buttonLayout->addWidget(m_createProjectButton);
-
-        m_addProjectButton = CreateLargeBoxButton(QIcon(":/Select_Folder.svg"), tr("Add a Project"), this);
-        m_addProjectButton->setIconSize(QSize(s_iconSize, s_iconSize));
-        buttonLayout->addWidget(m_addProjectButton);
-
-        QSpacerItem* buttonSpacer = new QSpacerItem(s_spacerSize, s_spacerSize, QSizePolicy::Expanding, QSizePolicy::Minimum);
-        buttonLayout->addItem(buttonSpacer);
-
-        vLayout->addItem(buttonLayout);
-
-        QSpacerItem* verticalSpacer = new QSpacerItem(s_spacerSize, s_spacerSize, QSizePolicy::Minimum, QSizePolicy::Expanding);
-        vLayout->addItem(verticalSpacer);
-
-        // Using border-image allows for scaling options background-image does not support
-        setStyleSheet("O3DE--ProjectManager--ScreenWidget { border-image: url(:/Backgrounds/FirstTimeBackgroundImage.jpg) repeat repeat; }");
-
-        connect(m_createProjectButton, &QPushButton::pressed, this, &FirstTimeUseScreen::HandleNewProjectButton);
-        connect(m_addProjectButton, &QPushButton::pressed, this, &FirstTimeUseScreen::HandleAddProjectButton);
-    }
-
-    ProjectManagerScreen FirstTimeUseScreen::GetScreenEnum()
-    {
-        return ProjectManagerScreen::FirstTimeUse;
-    }
-
-    void FirstTimeUseScreen::HandleNewProjectButton()
-    {
-        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
-        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
-    }
-    void FirstTimeUseScreen::HandleAddProjectButton()
-    {
-        emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
-    }
-
-    QPushButton* FirstTimeUseScreen::CreateLargeBoxButton(const QIcon& icon, const QString& text, QWidget* parent)
-    {
-        QPushButton* largeBoxButton = new QPushButton(icon, text, parent);
-
-        largeBoxButton->setFixedSize(s_boxButtonWidth, s_boxButtonHeight);
-        largeBoxButton->setFlat(true);
-        largeBoxButton->setFocusPolicy(Qt::FocusPolicy::NoFocus);
-        largeBoxButton->setStyleSheet("QPushButton { font-size: 14px; background-color: rgba(0, 0, 0, 191); }");
-
-        return largeBoxButton;
-    }
-
-} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.h b/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.h
deleted file mode 100644
index 80a2310d7a..0000000000
--- a/Code/Tools/ProjectManager/Source/FirstTimeUseScreen.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include <ScreenWidget.h>
-#endif
-
-QT_FORWARD_DECLARE_CLASS(QIcon)
-QT_FORWARD_DECLARE_CLASS(QPushButton)
-
-namespace O3DE::ProjectManager
-{
-    class FirstTimeUseScreen
-        : public ScreenWidget
-    {
-    public:
-        explicit FirstTimeUseScreen(QWidget* parent = nullptr);
-        ~FirstTimeUseScreen() = default;
-        ProjectManagerScreen GetScreenEnum() override;
-
-    protected slots:
-        void HandleNewProjectButton();
-        void HandleAddProjectButton();
-
-    private:
-        QPushButton* CreateLargeBoxButton(const QIcon& icon, const QString& text, QWidget* parent = nullptr);
-
-        QPushButton* m_createProjectButton;
-        QPushButton* m_addProjectButton;
-
-        inline constexpr static int s_contentMargins = 80;
-        inline constexpr static int s_buttonSpacing = 30;
-        inline constexpr static int s_iconSize = 24;
-        inline constexpr static int s_spacerSize = 20;
-        inline constexpr static int s_boxButtonWidth = 210;
-        inline constexpr static int s_boxButtonHeight = 280;
-    };
-
-} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
new file mode 100644
index 0000000000..6e9ad42017
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.cpp
@@ -0,0 +1,49 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzQtComponents/Components/SearchLineEdit.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <QHBoxLayout>
+#include <QLabel>
+
+namespace O3DE::ProjectManager
+{
+    GemCatalogHeaderWidget::GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent)
+        : QFrame(parent)
+    {
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setAlignment(Qt::AlignLeft);
+        hLayout->setMargin(0);
+        setLayout(hLayout);
+
+        setStyleSheet("background-color: #1E252F;");
+
+        QLabel* titleLabel = new QLabel(tr("Gem Catalog"));
+        titleLabel->setStyleSheet("font-size: 21px;");
+        hLayout->addWidget(titleLabel);
+
+        hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+
+        AzQtComponents::SearchLineEdit* filterLineEdit = new AzQtComponents::SearchLineEdit();
+        filterLineEdit->setStyleSheet("background-color: #DDDDDD;");
+        connect(filterLineEdit, &QLineEdit::textChanged, this, [=](const QString& text)
+            {
+                filterProxyModel->SetSearchString(text);
+            });
+        hLayout->addWidget(filterLineEdit);
+
+        hLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+        hLayout->addSpacerItem(new QSpacerItem(220, 0, QSizePolicy::Fixed));
+        
+        setFixedHeight(60);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
new file mode 100644
index 0000000000..3e065edd8f
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogHeaderWidget.h
@@ -0,0 +1,31 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <GemCatalog/GemSortFilterProxyModel.h>
+#include <QFrame>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemCatalogHeaderWidget
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemCatalogHeaderWidget(GemSortFilterProxyModel* filterProxyModel, QWidget* parent = nullptr);
+        ~GemCatalogHeaderWidget() = default;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 7d8cee45b4..2d243e7f8b 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -12,6 +12,8 @@
 
 #include <GemCatalog/GemCatalogScreen.h>
 #include <PythonBindingsInterface.h>
+#include <GemCatalog/GemCatalogHeaderWidget.h>
+#include <GemCatalog/GemListHeaderWidget.h>
 #include <GemCatalog/GemSortFilterProxyModel.h>
 #include <GemCatalog/GemFilterWidget.h>
 #include <QVBoxLayout>
@@ -34,6 +36,9 @@ namespace O3DE::ProjectManager
         vLayout->setSpacing(0);
         setLayout(vLayout);
 
+        GemCatalogHeaderWidget* headerWidget = new GemCatalogHeaderWidget(proxyModel);
+        vLayout->addWidget(headerWidget);
+
         QHBoxLayout* hLayout = new QHBoxLayout();
         hLayout->setMargin(0);
         vLayout->addLayout(hLayout);
@@ -64,9 +69,12 @@ namespace O3DE::ProjectManager
         GemFilterWidget* filterWidget = new GemFilterWidget(proxyModel);
         filterWidget->setFixedWidth(250);
 
+        GemListHeaderWidget* listHeaderWidget = new GemListHeaderWidget(proxyModel);
+
         QVBoxLayout* middleVLayout = new QVBoxLayout();
         middleVLayout->setMargin(0);
         middleVLayout->setSpacing(0);
+        middleVLayout->addWidget(listHeaderWidget);
         middleVLayout->addWidget(m_gemListView);
 
         hLayout->addWidget(filterWidget);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
index c6651b7295..3ece7760cf 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
@@ -124,12 +124,12 @@ namespace O3DE::ProjectManager
     {
         if (m_collapseButton->isChecked())
         {
-            m_collapseButton->setIcon(QIcon(":/Resources/ArrowDownLine.svg"));
+            m_collapseButton->setIcon(QIcon(":/ArrowDownLine.svg"));
             m_mainWidget->hide();
         }
         else
         {
-            m_collapseButton->setIcon(QIcon(":/Resources/ArrowUpLine.svg"));
+            m_collapseButton->setIcon(QIcon(":/ArrowUpLine.svg"));
             m_mainWidget->show();
         }
     }
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
index b96a1f242f..06b0adad32 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
@@ -62,20 +62,20 @@ namespace O3DE::ProjectManager
         bool IsValid() const;
 
         QString m_path;
-        QString m_name;
-        QString m_displayName;
+        QString m_name = "Unknown Gem Name";
+        QString m_displayName = "Unknown Gem Name";
         AZ::Uuid m_uuid;
-        QString m_creator;
+        QString m_creator = "Unknown Creator";
         GemOrigin m_gemOrigin = Local;
         bool m_isAdded = false; //! Is the gem currently added and enabled in the project?
-        QString m_summary;
+        QString m_summary = "No summary provided.";
         Platforms m_platforms;
         Types m_types; //! Asset and/or Code and/or Tool
         QStringList m_features;
         QString m_directoryLink;
         QString m_documentationLink;
-        QString m_version;
-        QString m_lastUpdatedDate;
+        QString m_version = "Unknown Version";
+        QString m_lastUpdatedDate = "Unknown Date";
         int m_binarySizeInKB = 0;
         QStringList m_dependingGemUuids;
         QStringList m_conflictingGemUuids;
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
new file mode 100644
index 0000000000..128fb93345
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.cpp
@@ -0,0 +1,78 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <GemCatalog/GemItemDelegate.h>
+#include <GemCatalog/GemListHeaderWidget.h>
+#include <QStandardItemModel>
+#include <QLabel>
+#include <QVBoxLayout>
+
+namespace O3DE::ProjectManager
+{
+    GemListHeaderWidget::GemListHeaderWidget(GemSortFilterProxyModel* proxyModel, QWidget* parent)
+        : QFrame(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setMargin(0);
+        setLayout(vLayout);
+
+        setStyleSheet("background-color: #333333;");
+
+        vLayout->addSpacing(20);
+
+        // Top section
+        QHBoxLayout* topLayout = new QHBoxLayout();
+        topLayout->setMargin(0);
+        topLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding));
+
+        QLabel* showCountLabel = new QLabel();
+        showCountLabel->setStyleSheet("font-size: 11pt; font: italic;");
+        topLayout->addWidget(showCountLabel);
+        connect(proxyModel, &GemSortFilterProxyModel::OnInvalidated, this, [=]
+            {
+                const int numGemsShown = proxyModel->rowCount();
+                showCountLabel->setText(QString(tr("showing %1 Gems")).arg(numGemsShown));
+            });
+
+        topLayout->addSpacing(GemItemDelegate::s_contentMargins.right() + GemItemDelegate::s_borderWidth);
+
+        vLayout->addLayout(topLayout);
+
+        vLayout->addSpacing(20);
+
+        // Separating line
+        QFrame* hLine = new QFrame();
+        hLine->setFrameShape(QFrame::HLine);
+        hLine->setStyleSheet("color: #666666;");
+        vLayout->addWidget(hLine);
+
+        vLayout->addSpacing(GemItemDelegate::s_contentMargins.top());
+
+        // Bottom section
+        QHBoxLayout* columnHeaderLayout = new QHBoxLayout();
+        columnHeaderLayout->setAlignment(Qt::AlignLeft);
+
+        columnHeaderLayout->addSpacing(31);
+
+        QLabel* gemNameLabel = new QLabel(tr("Gem Name"));
+        gemNameLabel->setStyleSheet("font-size: 11pt;");
+        columnHeaderLayout->addWidget(gemNameLabel);
+
+        columnHeaderLayout->addSpacing(111);
+
+        QLabel* gemSummaryLabel = new QLabel(tr("Gem Summary"));
+        gemSummaryLabel->setStyleSheet("font-size: 11pt;");
+        columnHeaderLayout->addWidget(gemSummaryLabel);
+
+        vLayout->addLayout(columnHeaderLayout);
+    }
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
new file mode 100644
index 0000000000..b16a654ad0
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemListHeaderWidget.h
@@ -0,0 +1,33 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <GemCatalog/GemSortFilterProxyModel.h>
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QFrame>
+#endif
+
+namespace O3DE::ProjectManager
+{
+    class GemListHeaderWidget
+        : public QFrame
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        explicit GemListHeaderWidget(GemSortFilterProxyModel* proxyModel, QWidget* parent = nullptr);
+        ~GemListHeaderWidget() = default;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
index ffbf1bf6fe..b57a2b35b2 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.cpp
@@ -12,6 +12,9 @@
 
 #include <NewProjectSettingsScreen.h>
 #include <PythonBindingsInterface.h>
+#include <FormLineEditWidget.h>
+#include <FormBrowseEditWidget.h>
+#include <PathValidator.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -23,6 +26,7 @@
 #include <QPushButton>
 #include <QSpacerItem>
 #include <QStandardPaths>
+#include <QFrame>
 
 namespace O3DE::ProjectManager
 {
@@ -31,64 +35,81 @@ namespace O3DE::ProjectManager
     NewProjectSettingsScreen::NewProjectSettingsScreen(QWidget* parent)
         : ScreenWidget(parent)
     {
-        QHBoxLayout* hLayout = new QHBoxLayout();
-        this->setLayout(hLayout);
+        QHBoxLayout* hLayout = new QHBoxLayout(this);
+        hLayout->setAlignment(Qt::AlignLeft);
+        hLayout->setContentsMargins(0,0,0,0);
 
+        // if we don't provide a parent for this box layout the stylesheet doesn't take
+        // if we don't set this in a frame (just use a sub-layout) all the content will align incorrectly horizontally
+        QFrame* projectSettingsFrame = new QFrame(this);
+        projectSettingsFrame->setObjectName("projectSettings");
         QVBoxLayout* vLayout = new QVBoxLayout(this);
 
-        QLabel* projectNameLabel = new QLabel(tr("Project Name"), this);
-        vLayout->addWidget(projectNameLabel);
-
-        m_projectNameLineEdit = new QLineEdit(tr("New Project"), this);
-        vLayout->addWidget(m_projectNameLineEdit);
-
-        QLabel* projectPathLabel = new QLabel(tr("Project Location"), this);
-        vLayout->addWidget(projectPathLabel);
-
+        // you cannot remove content margins in qss
+        vLayout->setContentsMargins(0,0,0,0);
+        vLayout->setAlignment(Qt::AlignTop);
         {
-            QHBoxLayout* projectPathLayout = new QHBoxLayout(this);
+            m_projectName = new FormLineEditWidget(tr("Project name"), tr("New Project"), this);
+            m_projectName->setErrorLabelText(
+                tr("A project with this name already exists at this location. Please choose a new name or location."));
+            vLayout->addWidget(m_projectName);
 
-            m_projectPathLineEdit = new QLineEdit(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), this);
-            projectPathLayout->addWidget(m_projectPathLineEdit);
+            m_projectPath =
+                new FormBrowseEditWidget(tr("Project Location"), QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), this);
+            m_projectPath->lineEdit()->setReadOnly(true);
+            m_projectPath->setErrorLabelText(tr("Please provide a valid path to a folder that exists"));
+            m_projectPath->lineEdit()->setValidator(new PathValidator(PathValidator::PathMode::ExistingFolder, this));
+            vLayout->addWidget(m_projectPath);
 
-            QPushButton* browseButton = new QPushButton(tr("Browse"), this);
-            connect(browseButton, &QPushButton::pressed, this, &NewProjectSettingsScreen::HandleBrowseButton);
-            projectPathLayout->addWidget(browseButton);
-
-            vLayout->addLayout(projectPathLayout);
-        }
-
-        QLabel* projectTemplateLabel = new QLabel(this);
-        projectTemplateLabel->setText("Project Template");
-        vLayout->addWidget(projectTemplateLabel);
-
-        QHBoxLayout* templateLayout = new QHBoxLayout(this);
-        vLayout->addItem(templateLayout);
-
-        m_projectTemplateButtonGroup = new QButtonGroup(this);
-        auto templatesResult = PythonBindingsInterface::Get()->GetProjectTemplates();
-        if (templatesResult.IsSuccess() && !templatesResult.GetValue().isEmpty())
-        {
-            for (auto projectTemplate : templatesResult.GetValue())
+            // if we don't use a QFrame we cannot "contain" the widgets inside and move them around
+            // as a group
+            QFrame* projectTemplateWidget = new QFrame(this);
+            projectTemplateWidget->setObjectName("projectTemplate");
+            QVBoxLayout* containerLayout = new QVBoxLayout();
+            containerLayout->setAlignment(Qt::AlignTop);
             {
-                QRadioButton* radioButton = new QRadioButton(projectTemplate.m_name, this);
-                radioButton->setProperty(k_pathProperty, projectTemplate.m_path);
-                m_projectTemplateButtonGroup->addButton(radioButton);
+                QLabel* projectTemplateLabel = new QLabel(tr("Select a Project Template"));
+                projectTemplateLabel->setObjectName("projectTemplateLabel");
+                containerLayout->addWidget(projectTemplateLabel);
 
-                templateLayout->addWidget(radioButton);
+                QLabel* projectTemplateDetailsLabel = new QLabel(tr("Project templates are pre-configured with relevant Gems that provide "
+                                                                    "additional functionality and content to the project."));
+                projectTemplateDetailsLabel->setWordWrap(true);
+                projectTemplateDetailsLabel->setObjectName("projectTemplateDetailsLabel");
+                containerLayout->addWidget(projectTemplateDetailsLabel);
+
+                QHBoxLayout* templateLayout = new QHBoxLayout(this);
+                containerLayout->addItem(templateLayout);
+
+                m_projectTemplateButtonGroup = new QButtonGroup(this);
+                m_projectTemplateButtonGroup->setObjectName("templateButtonGroup");
+                auto templatesResult = PythonBindingsInterface::Get()->GetProjectTemplates();
+                if (templatesResult.IsSuccess() && !templatesResult.GetValue().isEmpty())
+                {
+                    for (auto projectTemplate : templatesResult.GetValue())
+                    {
+                        QRadioButton* radioButton = new QRadioButton(projectTemplate.m_name, this);
+                        radioButton->setProperty(k_pathProperty, projectTemplate.m_path);
+                        m_projectTemplateButtonGroup->addButton(radioButton);
+
+                        containerLayout->addWidget(radioButton);
+                    }
+
+                    m_projectTemplateButtonGroup->buttons().first()->setChecked(true);
+                }
             }
-
-            m_projectTemplateButtonGroup->buttons().first()->setChecked(true);
+            projectTemplateWidget->setLayout(containerLayout);
+            vLayout->addWidget(projectTemplateWidget);
         }
+        projectSettingsFrame->setLayout(vLayout);
 
-        QSpacerItem* verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
-        vLayout->addItem(verticalSpacer);
+        hLayout->addWidget(projectSettingsFrame);
 
-        hLayout->addItem(vLayout);
+        QWidget* projectTemplateDetails = new QWidget(this);
+        projectTemplateDetails->setObjectName("projectTemplateDetails");
+        hLayout->addWidget(projectTemplateDetails);
 
-        QWidget* gemsListPlaceholder = new QWidget(this);
-        gemsListPlaceholder->setFixedWidth(250);
-        hLayout->addWidget(gemsListPlaceholder);
+        this->setLayout(hLayout);
     }
 
     ProjectManagerScreen NewProjectSettingsScreen::GetScreenEnum()
@@ -96,26 +117,12 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::NewProjectSettings;
     }
 
-    void NewProjectSettingsScreen::HandleBrowseButton()
-    {
-        QString defaultPath = m_projectPathLineEdit->text();
-        if (defaultPath.isEmpty())
-        {
-            defaultPath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
-        }
-
-        QString directory = QDir::toNativeSeparators(QFileDialog::getExistingDirectory(this, tr("New project path"), defaultPath));
-        if (!directory.isEmpty())
-        {
-            m_projectPathLineEdit->setText(directory);
-        }
-    }
 
     ProjectInfo NewProjectSettingsScreen::GetProjectInfo()
     {
         ProjectInfo projectInfo;
-        projectInfo.m_projectName = m_projectNameLineEdit->text();
-        projectInfo.m_path        = QDir::toNativeSeparators(m_projectPathLineEdit->text() + "/" + projectInfo.m_projectName);
+        projectInfo.m_projectName = m_projectName->lineEdit()->text();
+        projectInfo.m_path        = QDir::toNativeSeparators(m_projectPath->lineEdit()->text() + "/" + projectInfo.m_projectName);
         return projectInfo;
     }
 
@@ -127,18 +134,18 @@ namespace O3DE::ProjectManager
     bool NewProjectSettingsScreen::Validate()
     {
         bool projectNameIsValid = true;
-        if (m_projectNameLineEdit->text().isEmpty())
+        if (m_projectName->lineEdit()->text().isEmpty())
         {
             projectNameIsValid = false;
         }
 
         bool projectPathIsValid = true;
-        if (m_projectPathLineEdit->text().isEmpty())
+        if (m_projectPath->lineEdit()->text().isEmpty())
         {
             projectPathIsValid = false;
         }
 
-        QDir path(QDir::toNativeSeparators(m_projectPathLineEdit->text() + "/" + m_projectNameLineEdit->text()));
+        QDir path(QDir::toNativeSeparators(m_projectPath->lineEdit()->text() + "/" + m_projectName->lineEdit()->text()));
         if (path.exists() && !path.isEmpty())
         {
             projectPathIsValid = false;
diff --git a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
index 1cfd3c9c35..f0e9609fdc 100644
--- a/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
+++ b/Code/Tools/ProjectManager/Source/NewProjectSettingsScreen.h
@@ -17,10 +17,12 @@
 #endif
 
 QT_FORWARD_DECLARE_CLASS(QButtonGroup)
-QT_FORWARD_DECLARE_CLASS(QLineEdit)
 
 namespace O3DE::ProjectManager
 {
+    QT_FORWARD_DECLARE_CLASS(FormLineEditWidget)
+    QT_FORWARD_DECLARE_CLASS(FormBrowseEditWidget)
+
     class NewProjectSettingsScreen
         : public ScreenWidget
     {
@@ -38,8 +40,8 @@ namespace O3DE::ProjectManager
         void HandleBrowseButton();
 
     private:
-        QLineEdit* m_projectNameLineEdit;
-        QLineEdit* m_projectPathLineEdit;
+        FormLineEditWidget* m_projectName;
+        FormBrowseEditWidget* m_projectPath;
         QButtonGroup* m_projectTemplateButtonGroup;
     };
 
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
index ec1acdad61..4be876e79f 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp
@@ -31,11 +31,31 @@ namespace O3DE::ProjectManager
     LabelButton::LabelButton(QWidget* parent)
         : QLabel(parent)
     {
+        setObjectName("labelButton");
+        m_overlayLabel = new QLabel("", this);
+        m_overlayLabel->setObjectName("labelButtonOverlay");
+        m_overlayLabel->setWordWrap(true);
+        m_overlayLabel->setAlignment(Qt::AlignCenter);
+        m_overlayLabel->setVisible(false);
     }
 
     void LabelButton::mousePressEvent([[maybe_unused]] QMouseEvent* event)
     {
-        emit triggered();
+        if(m_enabled)
+        {
+            emit triggered();
+        }
+    }
+
+    void LabelButton::SetEnabled(bool enabled)
+    {
+        m_enabled = enabled;
+        m_overlayLabel->setVisible(!enabled);
+    }
+
+    void LabelButton::SetOverlayText(const QString& text)
+    {
+        m_overlayLabel->setText(text);
     }
 
     ProjectButton::ProjectButton(const QString& projectName, QWidget* parent)
@@ -56,6 +76,8 @@ namespace O3DE::ProjectManager
 
     void ProjectButton::Setup()
     {
+        setObjectName("projectButton");
+
         QVBoxLayout* vLayout = new QVBoxLayout();
         vLayout->setSpacing(0);
         vLayout->setContentsMargins(0, 0, 0, 0);
@@ -79,14 +101,21 @@ namespace O3DE::ProjectManager
         m_deleteProjectAction = newProjectMenu->addAction(tr("Delete the Project"));
 #endif
 
-        m_projectSettingsMenuButton = new QPushButton(this);
-        m_projectSettingsMenuButton->setText(m_projectName);
-        m_projectSettingsMenuButton->setMenu(newProjectMenu);
-        m_projectSettingsMenuButton->setFocusPolicy(Qt::FocusPolicy::NoFocus);
-        m_projectSettingsMenuButton->setStyleSheet("font-size: 14px; text-align:left;");
-        vLayout->addWidget(m_projectSettingsMenuButton);
+        QFrame* footer = new QFrame(this);
+        QHBoxLayout* hLayout = new QHBoxLayout();
+        hLayout->setContentsMargins(0, 0, 0, 0);
+        footer->setLayout(hLayout);
+        {
+            QLabel* projectNameLabel = new QLabel(m_projectName, this);
+            hLayout->addWidget(projectNameLabel);
 
-        setFixedSize(s_projectImageWidth, s_projectImageHeight + m_projectSettingsMenuButton->height());
+            QPushButton* projectMenuButton = new QPushButton(this);
+            projectMenuButton->setObjectName("projectMenuButton");
+            projectMenuButton->setMenu(newProjectMenu);
+            hLayout->addWidget(projectMenuButton);
+        }
+
+        vLayout->addWidget(footer);
 
         connect(m_projectImageLabel, &LabelButton::triggered, [this]() { emit OpenProject(m_projectName); });
         connect(m_editProjectAction, &QAction::triggered, [this]() { emit EditProject(m_projectName); });
@@ -99,4 +128,13 @@ namespace O3DE::ProjectManager
 #endif
     }
 
+    void ProjectButton::SetButtonEnabled(bool enabled)
+    {
+        m_projectImageLabel->SetEnabled(enabled);
+    }
+
+    void ProjectButton::SetButtonOverlayText(const QString& text)
+    {
+        m_projectImageLabel->SetOverlayText(text);
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
index c1aee8e63e..671debf6d0 100644
--- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
+++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h
@@ -32,11 +32,18 @@ namespace O3DE::ProjectManager
         explicit LabelButton(QWidget* parent = nullptr);
         ~LabelButton() = default;
 
+        void SetEnabled(bool enabled);
+        void SetOverlayText(const QString& text);
+
     signals:
         void triggered();
 
     public slots:
         void mousePressEvent(QMouseEvent* event) override;
+
+    private:
+        QLabel* m_overlayLabel;
+        bool m_enabled = true;
     };
 
     class ProjectButton
@@ -49,6 +56,9 @@ namespace O3DE::ProjectManager
         explicit ProjectButton(const QString& projectName, const QString& projectImage, QWidget* parent = nullptr);
         ~ProjectButton() = default;
 
+        void SetButtonEnabled(bool enabled);
+        void SetButtonOverlayText(const QString& text);
+
     signals:
         void OpenProject(const QString& projectName);
         void EditProject(const QString& projectName);
@@ -63,7 +73,6 @@ namespace O3DE::ProjectManager
         QString m_projectName;
         QString m_projectImagePath;
         LabelButton* m_projectImageLabel;
-        QPushButton* m_projectSettingsMenuButton;
         QAction* m_editProjectAction;
         QAction* m_editProjectGemsAction;
         QAction* m_copyProjectAction;
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
index eb79f2da1e..76bcc2eb99 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
@@ -11,52 +11,46 @@
  */
 
 #include <ProjectManagerWindow.h>
-#include <ScreenFactory.h>
+#include <ScreensCtrl.h>
 
 #include <AzQtComponents/Components/StyleManager.h>
 #include <AzCore/IO/Path/Path.h>
 
 #include <QDir>
 
-#include <Source/ui_ProjectManagerWindow.h>
-
 namespace O3DE::ProjectManager
 {
     ProjectManagerWindow::ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath)
         : QMainWindow(parent)
-        , m_ui(new Ui::ProjectManagerWindowClass())
     {
-        m_ui->setupUi(this);
-        QLayout* layout = m_ui->centralWidget->layout();
-        layout->setMargin(0);
-        layout->setSpacing(0);
-        layout->setContentsMargins(0, 0, 0, 0);
-
         m_pythonBindings = AZStd::make_unique<PythonBindings>(engineRootPath);
 
-        m_screensCtrl = new ScreensCtrl();
-        m_ui->verticalLayout->addWidget(m_screensCtrl);
+        setWindowTitle(tr("O3DE Project Manager"));
 
-        connect(m_ui->projectsMenu, &QMenu::aboutToShow, this, &ProjectManagerWindow::HandleProjectsMenu);
-        connect(m_ui->engineMenu, &QMenu::aboutToShow, this, &ProjectManagerWindow::HandleEngineMenu);
+        ScreensCtrl* screensCtrl = new ScreensCtrl();
 
+        // currently the tab order on the home page is based on the order of this list
+        QVector<ProjectManagerScreen> screenEnums =
+        {
+            ProjectManagerScreen::Projects,
+            ProjectManagerScreen::EngineSettings,
+            ProjectManagerScreen::CreateProject,
+            ProjectManagerScreen::UpdateProject
+        };
+        screensCtrl->BuildScreens(screenEnums);
+
+        setCentralWidget(screensCtrl);
+
+        // setup stylesheets and hot reloading 
         QDir rootDir = QString::fromUtf8(engineRootPath.Native().data(), aznumeric_cast<int>(engineRootPath.Native().size()));
         const auto pathOnDisk = rootDir.absoluteFilePath("Code/Tools/ProjectManager/Resources");
         const auto qrcPath = QStringLiteral(":/ProjectManager/style");
         AzQtComponents::StyleManager::addSearchPaths("style", pathOnDisk, qrcPath, engineRootPath);
 
+        // set stylesheet after creating the screens or their styles won't get updated
         AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral("style:ProjectManager.qss"));
 
-        QVector<ProjectManagerScreen> screenEnums =
-        {
-            ProjectManagerScreen::FirstTimeUse,
-            ProjectManagerScreen::CreateProject,
-            ProjectManagerScreen::ProjectsHome,
-            ProjectManagerScreen::UpdateProject,
-            ProjectManagerScreen::EngineSettings
-        };
-        m_screensCtrl->BuildScreens(screenEnums);
-        m_screensCtrl->ForceChangeToScreen(ProjectManagerScreen::FirstTimeUse, false);
+        screensCtrl->ForceChangeToScreen(ProjectManagerScreen::Projects, false);
     }
 
     ProjectManagerWindow::~ProjectManagerWindow()
@@ -64,13 +58,4 @@ namespace O3DE::ProjectManager
         m_pythonBindings.reset();
     }
 
-    void ProjectManagerWindow::HandleProjectsMenu()
-    {
-        m_screensCtrl->ChangeToScreen(ProjectManagerScreen::ProjectsHome);
-    }
-    void ProjectManagerWindow::HandleEngineMenu()
-    {
-        m_screensCtrl->ChangeToScreen(ProjectManagerScreen::EngineSettings);
-    }
-
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
index d5c586e59b..74db3467c5 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
@@ -13,17 +13,9 @@
 
 #if !defined(Q_MOC_RUN)
 #include <QMainWindow>
-
-#include <ScreensCtrl.h>
-
 #include <PythonBindings.h>
 #endif
 
-namespace Ui
-{
-    class ProjectManagerWindowClass;
-}
-
 namespace O3DE::ProjectManager
 {
     class ProjectManagerWindow
@@ -35,13 +27,7 @@ namespace O3DE::ProjectManager
         explicit ProjectManagerWindow(QWidget* parent, const AZ::IO::PathView& engineRootPath);
         ~ProjectManagerWindow();
 
-    protected slots:
-        void HandleProjectsMenu();
-        void HandleEngineMenu();
-
     private:
-        QScopedPointer<Ui::ProjectManagerWindowClass> m_ui;
-        ScreensCtrl* m_screensCtrl;
         AZStd::unique_ptr<PythonBindings> m_pythonBindings;
     };
 
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui b/Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui
deleted file mode 100644
index 633cd61182..0000000000
--- a/Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProjectManagerWindowClass</class>
- <widget class="QMainWindow" name="ProjectManagerWindowClass">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1200</width>
-    <height>800</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>O3DE Project Manager</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout"/>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1200</width>
-     <height>36</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <pointsize>16</pointsize>
-    </font>
-   </property>
-   <widget class="QMenu" name="iconMenu">
-    <property name="title">
-     <string>Icon</string>
-    </property>
-    <property name="icon">
-     <iconset resource="../Resources/ProjectManager.qrc">
-      <normaloff>:/o3de_editor.ico</normaloff>:/o3de_editor.ico</iconset>
-    </property>
-   </widget>
-   <widget class="QMenu" name="projectsMenu">
-    <property name="title">
-     <string>Projects</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="engineMenu">
-    <property name="title">
-     <string>Engine</string>
-    </property>
-   </widget>
-   <addaction name="iconMenu"/>
-   <addaction name="projectsMenu"/>
-   <addaction name="engineMenu"/>
-  </widget>
- </widget>
- <resources>
-  <include location="../Resources/ProjectManager.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp
deleted file mode 100644
index 411b46c55d..0000000000
--- a/Code/Tools/ProjectManager/Source/ProjectsHomeScreen.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include <ProjectsHomeScreen.h>
-
-#include <ProjectButtonWidget.h>
-#include <PythonBindingsInterface.h>
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QListView>
-#include <QSpacerItem>
-#include <QListWidget>
-#include <QListWidgetItem>
-#include <QFileInfo>
-#include <QScrollArea>
-
-namespace O3DE::ProjectManager
-{
-    ProjectsHomeScreen::ProjectsHomeScreen(QWidget* parent)
-        : ScreenWidget(parent)
-    {
-        QVBoxLayout* vLayout = new QVBoxLayout();
-        setLayout(vLayout);
-        vLayout->setContentsMargins(s_contentMargins, s_contentMargins, s_contentMargins, s_contentMargins);
-
-        QHBoxLayout* topLayout = new QHBoxLayout();
-
-        QLabel* titleLabel = new QLabel(this);
-        titleLabel->setText("My Projects");
-        titleLabel->setStyleSheet("font-size: 24px");
-        topLayout->addWidget(titleLabel);
-
-        QSpacerItem* topSpacer = new QSpacerItem(s_spacerSize, s_spacerSize, QSizePolicy::Expanding, QSizePolicy::Minimum);
-        topLayout->addItem(topSpacer);
-
-        QMenu* newProjectMenu = new QMenu(this);
-        m_createNewProjectAction = newProjectMenu->addAction("Create New Project");
-        m_addExistingProjectAction = newProjectMenu->addAction("Add Existing Project");
-
-        QPushButton* newProjectMenuButton = new QPushButton(this);
-        newProjectMenuButton->setText("New Project...");
-        newProjectMenuButton->setMenu(newProjectMenu);
-        newProjectMenuButton->setFixedWidth(s_newProjectButtonWidth);
-        newProjectMenuButton->setStyleSheet("font-size: 14px;");
-        topLayout->addWidget(newProjectMenuButton);
-
-        vLayout->addLayout(topLayout);
-
-        // Get all projects and create a horizontal scrolling list of them
-        auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
-        if (projectsResult.IsSuccess() && !projectsResult.GetValue().isEmpty())
-        {
-            QScrollArea* projectsScrollArea = new QScrollArea(this);
-            QWidget* scrollWidget = new QWidget();
-            QGridLayout* projectGridLayout = new QGridLayout();
-            scrollWidget->setLayout(projectGridLayout);
-            projectsScrollArea->setWidget(scrollWidget);
-            projectsScrollArea->setWidgetResizable(true);
-
-            int gridIndex = 0;
-            for (auto project : projectsResult.GetValue())
-            {
-                ProjectButton* projectButton;
-                QString projectPreviewPath = project.m_path + m_projectPreviewImagePath;
-                QFileInfo doesPreviewExist(projectPreviewPath);
-                if (doesPreviewExist.exists() && doesPreviewExist.isFile())
-                {
-                    projectButton = new ProjectButton(project.m_projectName, projectPreviewPath, this);
-                }
-                else
-                {
-                    projectButton = new ProjectButton(project.m_projectName, this);
-                }
-
-                // Create rows of projects buttons s_projectButtonRowCount buttons wide
-                projectGridLayout->addWidget(projectButton, gridIndex / s_projectButtonRowCount, gridIndex % s_projectButtonRowCount);
-
-                connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsHomeScreen::HandleOpenProject);
-                connect(projectButton, &ProjectButton::EditProject, this, &ProjectsHomeScreen::HandleEditProject);
-
-#ifdef SHOW_ALL_PROJECT_ACTIONS
-                connect(projectButton, &ProjectButton::EditProjectGems, this, &ProjectsHomeScreen::HandleEditProjectGems);
-                connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsHomeScreen::HandleCopyProject);
-                connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsHomeScreen::HandleRemoveProject);
-                connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsHomeScreen::HandleDeleteProject);
-#endif
-                ++gridIndex;
-            }
-
-            vLayout->addWidget(projectsScrollArea);
-        }
-
-        // Using border-image allows for scaling options background-image does not support
-        setStyleSheet("O3DE--ProjectManager--ScreenWidget { border-image: url(:/Backgrounds/FirstTimeBackgroundImage.jpg) repeat repeat; }");
-
-        connect(m_createNewProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleNewProjectButton);
-        connect(m_addExistingProjectAction, &QAction::triggered, this, &ProjectsHomeScreen::HandleAddProjectButton);
-    }
-
-    ProjectManagerScreen ProjectsHomeScreen::GetScreenEnum()
-    {
-        return ProjectManagerScreen::ProjectsHome;
-    }
-
-    void ProjectsHomeScreen::HandleNewProjectButton()
-    {
-        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
-        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
-    }
-    void ProjectsHomeScreen::HandleAddProjectButton()
-    {
-        // Do nothing for now
-    }
-    void ProjectsHomeScreen::HandleOpenProject(const QString& projectPath)
-    {
-        // Open the editor with this project open
-        emit NotifyCurrentProject(projectPath);
-    }
-    void ProjectsHomeScreen::HandleEditProject(const QString& projectPath)
-    {
-        emit NotifyCurrentProject(projectPath);
-        emit ResetScreenRequest(ProjectManagerScreen::UpdateProject);
-        emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject);
-    }
-    void ProjectsHomeScreen::HandleEditProjectGems(const QString& projectPath)
-    {
-        emit NotifyCurrentProject(projectPath);
-        emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);
-    }
-    void ProjectsHomeScreen::HandleCopyProject([[maybe_unused]] const QString& projectPath)
-    {
-        // Open file dialog and choose location for copied project then register copy with O3DE
-    }
-    void ProjectsHomeScreen::HandleRemoveProject([[maybe_unused]] const QString& projectPath)
-    {
-        // Unregister Project from O3DE 
-    }
-    void ProjectsHomeScreen::HandleDeleteProject([[maybe_unused]] const QString& projectPath)
-    {
-        // Remove project from 03DE and delete from disk
-        ProjectsHomeScreen::HandleRemoveProject(projectPath);
-    }
-
-} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
new file mode 100644
index 0000000000..5f1c0e2b36
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp
@@ -0,0 +1,347 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <ProjectsScreen.h>
+
+#include <ProjectButtonWidget.h>
+#include <PythonBindingsInterface.h>
+
+#include <AzQtComponents/Components/FlowLayout.h>
+#include <AzCore/Platform.h>
+#include <AzCore/IO/SystemFile.h>
+#include <AzFramework/AzFramework_Traits_Platform.h>
+#include <AzFramework/Process/ProcessCommon.h>
+#include <AzFramework/Process/ProcessWatcher.h>
+#include <AzCore/Utils/Utils.h>
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QMenu>
+#include <QListView>
+#include <QSpacerItem>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QFileInfo>
+#include <QScrollArea>
+#include <QStackedWidget>
+#include <QFrame>
+#include <QIcon>
+#include <QPixmap>
+#include <QSettings>
+#include <QMessageBox>
+#include <QTimer>
+
+//#define DISPLAY_PROJECT_DEV_DATA true 
+
+namespace O3DE::ProjectManager
+{
+    ProjectsScreen::ProjectsScreen(QWidget* parent)
+        : ScreenWidget(parent)
+    {
+        QVBoxLayout* vLayout = new QVBoxLayout();
+        vLayout->setAlignment(Qt::AlignTop);
+        vLayout->setContentsMargins(s_contentMargins, 0, s_contentMargins, 0);
+        setLayout(vLayout);
+
+        m_background.load(":/Backgrounds/FirstTimeBackgroundImage.jpg");
+
+        m_stack = new QStackedWidget(this);
+
+        m_firstTimeContent = CreateFirstTimeContent();
+        m_stack->addWidget(m_firstTimeContent);
+
+        m_projectsContent = CreateProjectsContent();
+        m_stack->addWidget(m_projectsContent);
+
+        vLayout->addWidget(m_stack);
+
+        connect(m_createNewProjectAction, &QAction::triggered, this, &ProjectsScreen::HandleNewProjectButton);
+        connect(m_addExistingProjectAction, &QAction::triggered, this, &ProjectsScreen::HandleAddProjectButton);
+    }
+
+    QFrame* ProjectsScreen::CreateFirstTimeContent()
+    {
+        QFrame* frame = new QFrame(this);
+        frame->setObjectName("firstTimeContent");
+        {
+            QVBoxLayout* layout = new QVBoxLayout(this);
+            layout->setContentsMargins(0, 0, 0, 0);
+            layout->setAlignment(Qt::AlignTop);
+            frame->setLayout(layout);
+
+            QLabel* titleLabel = new QLabel(tr("Ready. Set. Create."), this);
+            titleLabel->setObjectName("titleLabel");
+            layout->addWidget(titleLabel);
+
+            QLabel* introLabel = new QLabel(this);
+            introLabel->setObjectName("introLabel");
+            introLabel->setText(tr("Welcome to O3DE! Start something new by creating a project. Not sure what to create? \nExplore what's "
+                                   "available by downloading our sample project."));
+            layout->addWidget(introLabel);
+
+            QHBoxLayout* buttonLayout = new QHBoxLayout(this);
+            buttonLayout->setAlignment(Qt::AlignLeft);
+            buttonLayout->setSpacing(s_spacerSize);
+
+            // use a newline to force the text up
+            QPushButton* createProjectButton = new QPushButton(tr("Create a Project\n"), this);
+            createProjectButton->setObjectName("createProjectButton");
+            buttonLayout->addWidget(createProjectButton);
+
+            QPushButton* addProjectButton = new QPushButton(tr("Add a Project\n"), this);
+            addProjectButton->setObjectName("addProjectButton");
+            buttonLayout->addWidget(addProjectButton);
+
+            connect(createProjectButton, &QPushButton::clicked, this, &ProjectsScreen::HandleNewProjectButton);
+            connect(addProjectButton, &QPushButton::clicked, this, &ProjectsScreen::HandleAddProjectButton);
+
+            layout->addLayout(buttonLayout);
+        }
+
+        return frame;
+    }
+
+    QFrame* ProjectsScreen::CreateProjectsContent()
+    {
+        QFrame* frame = new QFrame(this);
+        frame->setObjectName("projectsContent");
+        {
+            QVBoxLayout* layout = new QVBoxLayout();
+            layout->setAlignment(Qt::AlignTop);
+            layout->setContentsMargins(0, 0, 0, 0);
+            frame->setLayout(layout);
+
+            QFrame* header = new QFrame(this);
+            QHBoxLayout* headerLayout = new QHBoxLayout();
+            {
+                QLabel* titleLabel = new QLabel(tr("My Projects"), this);
+                titleLabel->setObjectName("titleLabel");
+                headerLayout->addWidget(titleLabel);
+
+                QMenu* newProjectMenu = new QMenu(this);
+                m_createNewProjectAction = newProjectMenu->addAction("Create New Project");
+                m_addExistingProjectAction = newProjectMenu->addAction("Add Existing Project");
+
+                connect(m_createNewProjectAction, &QAction::triggered, this, &ProjectsScreen::HandleNewProjectButton);
+                connect(m_addExistingProjectAction, &QAction::triggered, this, &ProjectsScreen::HandleAddProjectButton);
+
+                QPushButton* newProjectMenuButton = new QPushButton(tr("New Project..."), this);
+                newProjectMenuButton->setObjectName("newProjectButton");
+                newProjectMenuButton->setMenu(newProjectMenu);
+                newProjectMenuButton->setDefault(true);
+                headerLayout->addWidget(newProjectMenuButton);
+            }
+            header->setLayout(headerLayout);
+
+            layout->addWidget(header);
+
+            // Get all projects and create a horizontal scrolling list of them
+            auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
+            if (projectsResult.IsSuccess() && !projectsResult.GetValue().isEmpty())
+            {
+                QScrollArea* projectsScrollArea = new QScrollArea(this);
+                QWidget* scrollWidget = new QWidget();
+
+                FlowLayout* flowLayout = new FlowLayout(0, s_spacerSize, s_spacerSize);
+                scrollWidget->setLayout(flowLayout);
+
+                projectsScrollArea->setWidget(scrollWidget);
+                projectsScrollArea->setWidgetResizable(true);
+
+#ifndef DISPLAY_PROJECT_DEV_DATA
+                for (auto project : projectsResult.GetValue())
+#else
+                ProjectInfo project = projectsResult.GetValue().at(0);
+                for (int i = 0; i < 15; i++)
+#endif
+                {
+                    ProjectButton* projectButton;
+                    QString projectPreviewPath = project.m_path + m_projectPreviewImagePath;
+                    QFileInfo doesPreviewExist(projectPreviewPath);
+                    if (doesPreviewExist.exists() && doesPreviewExist.isFile())
+                    {
+                        projectButton = new ProjectButton(project.m_projectName, projectPreviewPath, this);
+                    }
+                    else
+                    {
+                        projectButton = new ProjectButton(project.m_projectName, this);
+                    }
+
+                    flowLayout->addWidget(projectButton);
+
+                    connect(projectButton, &ProjectButton::OpenProject, this, &ProjectsScreen::HandleOpenProject);
+                    connect(projectButton, &ProjectButton::EditProject, this, &ProjectsScreen::HandleEditProject);
+
+    #ifdef DISPLAY_PROJECT_DEV_DATA
+                    connect(projectButton, &ProjectButton::EditProjectGems, this, &ProjectsScreen::HandleEditProjectGems);
+                    connect(projectButton, &ProjectButton::CopyProject, this, &ProjectsScreen::HandleCopyProject);
+                    connect(projectButton, &ProjectButton::RemoveProject, this, &ProjectsScreen::HandleRemoveProject);
+                    connect(projectButton, &ProjectButton::DeleteProject, this, &ProjectsScreen::HandleDeleteProject);
+    #endif
+                }
+
+                layout->addWidget(projectsScrollArea);
+            }
+        }
+
+        return frame;
+    }
+
+    ProjectManagerScreen ProjectsScreen::GetScreenEnum()
+    {
+        return ProjectManagerScreen::Projects;
+    }
+
+    bool ProjectsScreen::IsTab()
+    {
+        return true;
+    }
+
+    QString ProjectsScreen::GetTabText()
+    {
+        return tr("Projects");
+    }
+
+    void ProjectsScreen::paintEvent([[maybe_unused]] QPaintEvent* event)
+    {
+        // we paint the background here because qss does not support background cover scaling
+        QPainter painter(this);
+
+        auto winSize = size();
+        auto pixmapRatio = (float)m_background.width() / m_background.height();
+        auto windowRatio = (float)winSize.width() / winSize.height();
+
+        if (pixmapRatio > windowRatio)
+        {
+            auto newWidth = (int)(winSize.height() * pixmapRatio);
+            auto offset = (newWidth - winSize.width()) / -2;
+            painter.drawPixmap(offset, 0, newWidth, winSize.height(), m_background);
+        }
+        else
+        {
+            auto newHeight = (int)(winSize.width() / pixmapRatio);
+            painter.drawPixmap(0, 0, winSize.width(), newHeight, m_background);
+        }
+    }
+
+    void ProjectsScreen::HandleNewProjectButton()
+    {
+        emit ResetScreenRequest(ProjectManagerScreen::CreateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::CreateProject);
+    }
+    void ProjectsScreen::HandleAddProjectButton()
+    {
+        // Do nothing for now
+    }
+    void ProjectsScreen::HandleOpenProject(const QString& projectPath)
+    {
+        if (!projectPath.isEmpty())
+        {
+            AZ::IO::FixedMaxPath executableDirectory = AZ::Utils::GetExecutableDirectory();
+            AZStd::string executableFilename = "Editor";
+            AZ::IO::FixedMaxPath editorExecutablePath = executableDirectory / (executableFilename + AZ_TRAIT_OS_EXECUTABLE_EXTENSION);
+            auto cmdPath = AZ::IO::FixedMaxPathString::format("%s -regset=\"/Amazon/AzCore/Bootstrap/project_path=%s\"", editorExecutablePath.c_str(), projectPath.toStdString().c_str());
+
+            AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
+            processLaunchInfo.m_commandlineParameters = cmdPath;
+            bool launchSucceeded = AzFramework::ProcessLauncher::LaunchUnwatchedProcess(processLaunchInfo);
+            if (!launchSucceeded)
+            {
+                AZ_Error("ProjectManager", false, "Failed to launch editor");
+                QMessageBox::critical( this, tr("Error"), tr("Failed to launch the Editor, please verify the project settings are valid."));
+            }
+            else
+            {
+                // prevent the user from accidentally pressing the button while the editor is launching
+                // and let them know what's happening
+                ProjectButton* button = qobject_cast<ProjectButton*>(sender());
+                if (button)
+                {
+                    button->SetButtonEnabled(false);
+                    button->SetButtonOverlayText(tr("Opening Editor..."));
+                }
+
+                // enable the button after 3 seconds 
+                constexpr int waitTimeInMs = 3000;
+                QTimer::singleShot(waitTimeInMs, this, [this, button] {
+                        if (button)
+                        {
+                            button->SetButtonEnabled(true);
+                        }
+                    });
+            }
+        }
+        else
+        {
+            AZ_Error("ProjectManager", false, "Cannot open editor because an empty project path was provided");
+            QMessageBox::critical( this, tr("Error"), tr("Failed to launch the Editor because the project path is invalid."));
+        }
+
+    }
+    void ProjectsScreen::HandleEditProject(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ResetScreenRequest(ProjectManagerScreen::UpdateProject);
+        emit ChangeScreenRequest(ProjectManagerScreen::UpdateProject);
+    }
+    void ProjectsScreen::HandleEditProjectGems(const QString& projectPath)
+    {
+        emit NotifyCurrentProject(projectPath);
+        emit ChangeScreenRequest(ProjectManagerScreen::GemCatalog);
+    }
+    void ProjectsScreen::HandleCopyProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Open file dialog and choose location for copied project then register copy with O3DE
+    }
+    void ProjectsScreen::HandleRemoveProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Unregister Project from O3DE 
+    }
+    void ProjectsScreen::HandleDeleteProject([[maybe_unused]] const QString& projectPath)
+    {
+        // Remove project from 03DE and delete from disk
+        ProjectsScreen::HandleRemoveProject(projectPath);
+    }
+
+    void ProjectsScreen::NotifyCurrentScreen()
+    {
+        if (ShouldDisplayFirstTimeContent())
+        {
+            m_stack->setCurrentWidget(m_firstTimeContent);
+        }
+        else
+        {
+            m_stack->setCurrentWidget(m_projectsContent);
+        }
+    }
+
+    bool ProjectsScreen::ShouldDisplayFirstTimeContent()
+    {
+        auto projectsResult = PythonBindingsInterface::Get()->GetProjects();
+        if (!projectsResult.IsSuccess() || projectsResult.GetValue().isEmpty())
+        {
+            return true;
+        }
+
+        QSettings settings;
+        bool displayFirstTimeContent = settings.value("displayFirstTimeContent", true).toBool();
+        if (displayFirstTimeContent)
+        {
+            settings.setValue("displayFirstTimeContent", false);
+        }
+
+        return displayFirstTimeContent;
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ProjectsHomeScreen.h b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
similarity index 69%
rename from Code/Tools/ProjectManager/Source/ProjectsHomeScreen.h
rename to Code/Tools/ProjectManager/Source/ProjectsScreen.h
index e8d1ac4fb5..d88ba8398d 100644
--- a/Code/Tools/ProjectManager/Source/ProjectsHomeScreen.h
+++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.h
@@ -15,16 +15,26 @@
 #include <ScreenWidget.h>
 #endif
 
+QT_FORWARD_DECLARE_CLASS(QPaintEvent)
+QT_FORWARD_DECLARE_CLASS(QFrame)
+QT_FORWARD_DECLARE_CLASS(QStackedWidget)
+
 namespace O3DE::ProjectManager
 {
-    class ProjectsHomeScreen
+    class ProjectsScreen
         : public ScreenWidget
     {
 
     public:
-        explicit ProjectsHomeScreen(QWidget* parent = nullptr);
-        ~ProjectsHomeScreen() = default;
+        explicit ProjectsScreen(QWidget* parent = nullptr);
+        ~ProjectsScreen() = default;
+
         ProjectManagerScreen GetScreenEnum() override;
+        QString GetTabText() override;
+        bool IsTab() override;
+
+    protected:
+        void NotifyCurrentScreen() override;
 
     protected slots:
         void HandleNewProjectButton();
@@ -36,16 +46,24 @@ namespace O3DE::ProjectManager
         void HandleRemoveProject(const QString& projectPath);
         void HandleDeleteProject(const QString& projectPath);
 
+        void paintEvent(QPaintEvent* event) override;
+
     private:
+        QFrame* CreateFirstTimeContent();
+        QFrame* CreateProjectsContent();
+        bool ShouldDisplayFirstTimeContent();
+
         QAction* m_createNewProjectAction;
         QAction* m_addExistingProjectAction;
+        QPixmap m_background;
+        QFrame* m_firstTimeContent;
+        QFrame* m_projectsContent;
+        QStackedWidget* m_stack;
 
         const QString m_projectPreviewImagePath = "/preview.png";
+
         inline constexpr static int s_contentMargins = 80;
         inline constexpr static int s_spacerSize = 20;
-        inline constexpr static int s_projectButtonRowCount = 4;
-        inline constexpr static int s_newProjectButtonWidth = 156;
-
     };
 
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ScreenDefs.h b/Code/Tools/ProjectManager/Source/ScreenDefs.h
index 13289e2481..46d243f677 100644
--- a/Code/Tools/ProjectManager/Source/ScreenDefs.h
+++ b/Code/Tools/ProjectManager/Source/ScreenDefs.h
@@ -17,11 +17,10 @@ namespace O3DE::ProjectManager
     {
         Invalid = -1,
         Empty,
-        FirstTimeUse,
         CreateProject,
         NewProjectSettings,
         GemCatalog,
-        ProjectsHome,
+        Projects,
         UpdateProject,
         ProjectSettings,
         EngineSettings
diff --git a/Code/Tools/ProjectManager/Source/ScreenFactory.cpp b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
index d37ccdb59f..b2b4376e14 100644
--- a/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreenFactory.cpp
@@ -11,12 +11,11 @@
  */
 #include <ScreenFactory.h>
 
-#include <FirstTimeUseScreen.h>
 #include <CreateProjectCtrl.h>
 #include <UpdateProjectCtrl.h>
 #include <NewProjectSettingsScreen.h>
 #include <GemCatalog/GemCatalogScreen.h>
-#include <ProjectsHomeScreen.h>
+#include <ProjectsScreen.h>
 #include <ProjectSettingsScreen.h>
 #include <EngineSettingsScreen.h>
 
@@ -28,9 +27,6 @@ namespace O3DE::ProjectManager
 
         switch(screen)
         {
-        case (ProjectManagerScreen::FirstTimeUse):
-            newScreen = new FirstTimeUseScreen(parent);
-            break;
         case (ProjectManagerScreen::CreateProject):
             newScreen = new CreateProjectCtrl(parent);
             break;
@@ -40,8 +36,8 @@ namespace O3DE::ProjectManager
         case (ProjectManagerScreen::GemCatalog):
             newScreen = new GemCatalogScreen(parent);
             break;
-        case (ProjectManagerScreen::ProjectsHome):
-            newScreen = new ProjectsHomeScreen(parent);
+        case (ProjectManagerScreen::Projects):
+            newScreen = new ProjectsScreen(parent);
             break;
         case (ProjectManagerScreen::UpdateProject):
             newScreen = new UpdateProjectCtrl(parent);
diff --git a/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp
new file mode 100644
index 0000000000..29b1eb6ff6
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.cpp
@@ -0,0 +1,62 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <ScreenHeaderWidget.h>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QLabel>
+
+namespace O3DE::ProjectManager
+{
+    ScreenHeader::ScreenHeader(QWidget* parent)
+        : QFrame(parent)
+    {
+        setObjectName("header");
+
+        QHBoxLayout* layout = new QHBoxLayout();
+        layout->setAlignment(Qt::AlignLeft);
+        layout->setContentsMargins(0,0,0,0);
+
+        m_backButton = new QPushButton();
+        m_backButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+        layout->addWidget(m_backButton);
+
+        QVBoxLayout* titleLayout = new QVBoxLayout();
+        m_title = new QLabel();
+        m_title->setObjectName("headerTitle");
+        titleLayout->addWidget(m_title);
+
+        m_subTitle = new QLabel();
+        m_subTitle->setObjectName("headerSubTitle");
+        titleLayout->addWidget(m_subTitle);
+
+        layout->addLayout(titleLayout);
+
+        setLayout(layout);
+    }
+
+    void ScreenHeader::setTitle(const QString& text)
+    {
+        m_title->setText(text);
+    }
+
+    void ScreenHeader::setSubTitle(const QString& text)
+    {
+        m_subTitle->setText(text);
+    }
+
+    QPushButton* ScreenHeader::backButton()
+    {
+        return m_backButton;
+    }
+
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h
new file mode 100644
index 0000000000..c5fdb56195
--- /dev/null
+++ b/Code/Tools/ProjectManager/Source/ScreenHeaderWidget.h
@@ -0,0 +1,42 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#if !defined(Q_MOC_RUN)
+#include <QFrame>
+#endif
+
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+
+namespace O3DE::ProjectManager
+{
+    class ScreenHeader 
+        : public QFrame 
+    {
+        Q_OBJECT // AUTOMOC
+
+    public:
+        ScreenHeader(QWidget* parent = nullptr);
+
+        void setTitle(const QString& text);
+        void setSubTitle(const QString& text);
+
+        QPushButton* backButton();
+
+    private:
+        QLabel* m_title;
+        QLabel* m_subTitle;
+        QPushButton* m_backButton;
+    };
+} // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ScreenWidget.h b/Code/Tools/ProjectManager/Source/ScreenWidget.h
index e80747d67b..2ad6d30201 100644
--- a/Code/Tools/ProjectManager/Source/ScreenWidget.h
+++ b/Code/Tools/ProjectManager/Source/ScreenWidget.h
@@ -41,12 +41,27 @@ namespace O3DE::ProjectManager
         {
             return true;
         }
+        virtual bool IsTab()
+        {
+            return false;
+        }
+        virtual QString GetTabText()
+        {
+            return tr("Missing");
+        }
+
+        //! Notify this screen it is the current screen 
+        virtual void NotifyCurrentScreen()
+        {
+
+        }
 
     signals:
         void ChangeScreenRequest(ProjectManagerScreen screen);
         void GotoPreviousScreenRequest();
         void ResetScreenRequest(ProjectManagerScreen screen);
         void NotifyCurrentProject(const QString& projectPath);
+
     };
 
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp b/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
index a77c434026..7d31d02f6c 100644
--- a/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/ScreensCtrl.cpp
@@ -14,6 +14,7 @@
 #include <ScreenFactory.h>
 #include <ScreenWidget.h>
 
+#include <QTabWidget>
 #include <QVBoxLayout>
 
 namespace O3DE::ProjectManager
@@ -21,17 +22,19 @@ namespace O3DE::ProjectManager
     ScreensCtrl::ScreensCtrl(QWidget* parent)
         : QWidget(parent)
     {
+        setObjectName("ScreensCtrl");
+
         QVBoxLayout* vLayout = new QVBoxLayout();
-        vLayout->setMargin(0);
-        vLayout->setSpacing(0);
         vLayout->setContentsMargins(0, 0, 0, 0);
         setLayout(vLayout);
 
         m_screenStack = new QStackedWidget();
         vLayout->addWidget(m_screenStack);
 
-        //Track the bottom of the stack
-        m_screenVisitOrder.push(ProjectManagerScreen::Invalid);
+        // add a tab widget at the bottom of the stack
+        m_tabWidget = new QTabWidget();
+        m_screenStack->addWidget(m_tabWidget);
+        connect(m_tabWidget, &QTabWidget::currentChanged, this, &ScreensCtrl::TabChanged);
     }
 
     void ScreensCtrl::BuildScreens(QVector<ProjectManagerScreen> screens)
@@ -57,7 +60,14 @@ namespace O3DE::ProjectManager
 
     ScreenWidget* ScreensCtrl::GetCurrentScreen()
     {
-        return reinterpret_cast<ScreenWidget*>(m_screenStack->currentWidget());
+        if (m_screenStack->currentWidget() == m_tabWidget)
+        {
+            return reinterpret_cast<ScreenWidget*>(m_tabWidget->currentWidget());
+        }
+        else
+        {
+            return reinterpret_cast<ScreenWidget*>(m_screenStack->currentWidget());
+        }
     }
 
     bool ScreensCtrl::ChangeToScreen(ProjectManagerScreen screen)
@@ -79,13 +89,28 @@ namespace O3DE::ProjectManager
         if (iterator != m_screenMap.end())
         {
             ScreenWidget* currentScreen = GetCurrentScreen();
-            if (currentScreen != iterator.value())
+            ScreenWidget* newScreen = iterator.value();
+
+            if (currentScreen != newScreen)
             {
                 if (addVisit)
                 {
-                    m_screenVisitOrder.push(currentScreen->GetScreenEnum());
+                    ProjectManagerScreen oldScreen = currentScreen->GetScreenEnum();
+                    m_screenVisitOrder.push(oldScreen);
                 }
-                m_screenStack->setCurrentWidget(iterator.value());
+
+                if (newScreen->IsTab())
+                {
+                    m_tabWidget->setCurrentWidget(newScreen);
+                    m_screenStack->setCurrentWidget(m_tabWidget);
+                }
+                else
+                {
+                    m_screenStack->setCurrentWidget(newScreen);
+                }
+
+                newScreen->NotifyCurrentScreen();
+
                 return true;
             }
         }
@@ -95,23 +120,46 @@ namespace O3DE::ProjectManager
 
     bool ScreensCtrl::GotoPreviousScreen()
     {
-        // Don't go back if we are on the first set screen
-        if (m_screenVisitOrder.top() != ProjectManagerScreen::Invalid)
+        if (!m_screenVisitOrder.isEmpty())
         {
             // We do not check with screen if we can go back, we should always be able to go back
-            return ForceChangeToScreen(m_screenVisitOrder.pop(), false);
+            ProjectManagerScreen previousScreen = m_screenVisitOrder.pop();
+            return ForceChangeToScreen(previousScreen, false);
         }
         return false;
     }
 
     void ScreensCtrl::ResetScreen(ProjectManagerScreen screen)
     {
+        bool shouldRestoreCurrentScreen = false;
+        if (GetCurrentScreen() && GetCurrentScreen()->GetScreenEnum() == screen)
+        {
+            shouldRestoreCurrentScreen = true;
+        }
+
         // Delete old screen if it exists to start fresh
         DeleteScreen(screen);
 
         // Add new screen
         ScreenWidget* newScreen = BuildScreen(this, screen);
-        m_screenStack->addWidget(newScreen);
+        if (newScreen->IsTab())
+        {
+            m_tabWidget->addTab(newScreen, newScreen->GetTabText());
+            if (shouldRestoreCurrentScreen)
+            {
+                m_tabWidget->setCurrentWidget(newScreen);
+                m_screenStack->setCurrentWidget(m_tabWidget);
+            }
+        }
+        else
+        {
+            m_screenStack->addWidget(newScreen);
+            if (shouldRestoreCurrentScreen)
+            {
+                m_screenStack->setCurrentWidget(newScreen);
+            }
+        }
+
         m_screenMap.insert(screen, newScreen);
 
         connect(newScreen, &ScreenWidget::ChangeScreenRequest, this, &ScreensCtrl::ChangeToScreen);
@@ -134,8 +182,21 @@ namespace O3DE::ProjectManager
         const auto iter = m_screenMap.find(screen);
         if (iter != m_screenMap.end())
         {
-            m_screenStack->removeWidget(iter.value());
-            iter.value()->deleteLater();
+            ScreenWidget* screenToDelete = iter.value();
+            if (screenToDelete->IsTab())
+            {
+                int tabIndex = m_tabWidget->indexOf(screenToDelete);
+                if (tabIndex > -1)
+                {
+                    m_tabWidget->removeTab(tabIndex);
+                }
+            }
+            else
+            {
+                // if the screen we delete is the current widget, a new one will
+                // be selected automatically (randomly?)
+                m_screenStack->removeWidget(screenToDelete);
+            }
 
             // Erase does not cause a rehash so interators remain valid
             m_screenMap.erase(iter);
@@ -150,4 +211,12 @@ namespace O3DE::ProjectManager
         }
     }
 
+    void ScreensCtrl::TabChanged([[maybe_unused]] int index)
+    {
+        ScreenWidget* screen = reinterpret_cast<ScreenWidget*>(m_tabWidget->currentWidget());
+        if (screen)
+        {
+            screen->NotifyCurrentScreen();
+        }
+    }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/ScreensCtrl.h b/Code/Tools/ProjectManager/Source/ScreensCtrl.h
index a9d1023b4b..935fc78e25 100644
--- a/Code/Tools/ProjectManager/Source/ScreensCtrl.h
+++ b/Code/Tools/ProjectManager/Source/ScreensCtrl.h
@@ -18,6 +18,8 @@
 #include <QStack>
 #endif
 
+QT_FORWARD_DECLARE_CLASS(QTabWidget)
+
 namespace O3DE::ProjectManager
 {
     class ScreenWidget;
@@ -46,11 +48,13 @@ namespace O3DE::ProjectManager
         void ResetAllScreens();
         void DeleteScreen(ProjectManagerScreen screen);
         void DeleteAllScreens();
+        void TabChanged(int index);
 
     private:
         QStackedWidget* m_screenStack;
         QHash<ProjectManagerScreen, ScreenWidget*> m_screenMap;
         QStack<ProjectManagerScreen> m_screenVisitOrder;
+        QTabWidget* m_tabWidget;
     };
 
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index 84e3d8359d..b3180966ce 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -108,7 +108,7 @@ namespace O3DE::ProjectManager
             auto result = PythonBindingsInterface::Get()->UpdateProject(m_projectInfo);
             if (result)
             {
-                emit ChangeScreenRequest(ProjectManagerScreen::ProjectsHome);
+                emit ChangeScreenRequest(ProjectManagerScreen::Projects);
             }
             else
             {
diff --git a/Code/Tools/ProjectManager/Source/main.cpp b/Code/Tools/ProjectManager/Source/main.cpp
index 3d8bb71a0c..cbeacbaf65 100644
--- a/Code/Tools/ProjectManager/Source/main.cpp
+++ b/Code/Tools/ProjectManager/Source/main.cpp
@@ -35,7 +35,6 @@ int main(int argc, char* argv[])
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
     AzQtComponents::Utilities::HandleDpiAwareness(AzQtComponents::Utilities::SystemDpiAware);
 
-
     AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
     int runSuccess = 0;
     {
@@ -55,6 +54,12 @@ int main(int argc, char* argv[])
         O3DE::ProjectManager::ProjectManagerWindow window(nullptr, engineRootPath);
         window.show();
 
+        // somethings is preventing us from moving the window to the center of the
+        // primary screen - likely an Az style or component helper
+        constexpr int width = 1200;
+        constexpr int height = 800;
+        window.resize(width, height);
+
         runSuccess = app.exec();
     }
     AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
diff --git a/Code/Tools/ProjectManager/project_manager_files.cmake b/Code/Tools/ProjectManager/project_manager_files.cmake
index 5fd2b4a9d8..223465f3c8 100644
--- a/Code/Tools/ProjectManager/project_manager_files.cmake
+++ b/Code/Tools/ProjectManager/project_manager_files.cmake
@@ -21,8 +21,6 @@ set(FILES
     Source/ScreenWidget.h
     Source/EngineInfo.h
     Source/EngineInfo.cpp
-    Source/FirstTimeUseScreen.h
-    Source/FirstTimeUseScreen.cpp
     Source/FormLineEditWidget.h
     Source/FormLineEditWidget.cpp
     Source/FormBrowseEditWidget.h
@@ -33,7 +31,6 @@ set(FILES
     Source/ProjectManagerWindow.cpp
     Source/ProjectTemplateInfo.h
     Source/ProjectTemplateInfo.cpp
-    Source/ProjectManagerWindow.ui
     Source/PythonBindings.h
     Source/PythonBindings.cpp
     Source/PythonBindingsInterface.h
@@ -45,8 +42,8 @@ set(FILES
     Source/CreateProjectCtrl.cpp
     Source/UpdateProjectCtrl.h
     Source/UpdateProjectCtrl.cpp
-    Source/ProjectsHomeScreen.h
-    Source/ProjectsHomeScreen.cpp
+    Source/ProjectsScreen.h
+    Source/ProjectsScreen.cpp
     Source/ProjectSettingsScreen.h
     Source/ProjectSettingsScreen.cpp
     Source/ProjectSettingsScreen.ui
@@ -54,10 +51,14 @@ set(FILES
     Source/EngineSettingsScreen.cpp
     Source/ProjectButtonWidget.h
     Source/ProjectButtonWidget.cpp
+    Source/ScreenHeaderWidget.h
+    Source/ScreenHeaderWidget.cpp
     Source/LinkWidget.h
     Source/LinkWidget.cpp
     Source/TagWidget.h
     Source/TagWidget.cpp
+    Source/GemCatalog/GemCatalogHeaderWidget.h
+    Source/GemCatalog/GemCatalogHeaderWidget.cpp
     Source/GemCatalog/GemCatalogScreen.h
     Source/GemCatalog/GemCatalogScreen.cpp
     Source/GemCatalog/GemFilterWidget.h
@@ -70,6 +71,8 @@ set(FILES
     Source/GemCatalog/GemItemDelegate.cpp
     Source/GemCatalog/GemListView.h
     Source/GemCatalog/GemListView.cpp
+    Source/GemCatalog/GemListHeaderWidget.h
+    Source/GemCatalog/GemListHeaderWidget.cpp
     Source/GemCatalog/GemModel.h
     Source/GemCatalog/GemModel.cpp
     Source/GemCatalog/GemSortFilterProxyModel.h
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
index 3dc14814de..4ab41423fa 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
@@ -38,21 +38,8 @@ namespace AZ
     {
         namespace FbxSceneBuilder
         {
-            static AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler* g_fbxImporter = nullptr;
             static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors;
 
-            void Initialize()
-            {
-                // Currently it's still needed to explicitly create an instance of this instead of letting
-                //      it be a normal component. This is because ResourceCompilerScene needs to return
-                //      the list of available extensions before it can start the application.
-                if (!g_fbxImporter)
-                {
-                    g_fbxImporter = aznew AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler();
-                    g_fbxImporter->Activate();
-                }
-            }
-
             void Reflect(AZ::SerializeContext* /*context*/)
             {
                 // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before
@@ -64,6 +51,7 @@ namespace AZ
                 {
                     // Global importer and behavior
                     g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor());
+                    g_componentDescriptors.push_back(FbxSceneImporter::FbxImportRequestHandler::CreateDescriptor());
 
                     // Node and attribute importers
                     g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
@@ -110,13 +98,6 @@ namespace AZ
                     g_componentDescriptors.clear();
                     g_componentDescriptors.shrink_to_fit();
                 }
-
-                if (g_fbxImporter)
-                {
-                    g_fbxImporter->Deactivate();
-                    delete g_fbxImporter;
-                    g_fbxImporter = nullptr;
-                }
             }
         } // namespace FbxSceneBuilder
     } // namespace SceneAPI
@@ -125,7 +106,6 @@ namespace AZ
 extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
 {
     AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
-    AZ::SceneAPI::FbxSceneBuilder::Initialize();
 }
 extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
 {
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
index 155209f1b5..a8b059304d 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
@@ -10,12 +10,16 @@
 *
 */
 
+#include <AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h>
+#include <AzCore/Serialization/EditContextConstants.inl>
 #include <AzCore/Serialization/SerializeContext.h>
-#include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/Serialization/Json/JsonSerialization.h>
+#include <AzCore/Settings/SettingsRegistry.h>
+#include <AzCore/StringFunc/StringFunc.h>
+#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
 #include <SceneAPI/SceneCore/Containers/Scene.h>
 #include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
 #include <SceneAPI/SceneCore/Events/ImportEventContext.h>
-#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
 
 namespace AZ
 {
@@ -23,10 +27,23 @@ namespace AZ
     {
         namespace FbxSceneImporter
         {
-            const char* FbxImportRequestHandler::s_extension = ".fbx";
+            void SceneImporterSettings::Reflect(AZ::ReflectContext* context)
+            {
+                if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext)
+                {
+                    serializeContext->Class<SceneImporterSettings>()
+                                    ->Version(2)
+                                    ->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions);
+                }
+            }
 
             void FbxImportRequestHandler::Activate()
             {
+                if (auto* settingsRegistry = AZ::SettingsRegistry::Get())
+                {
+                    settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter");
+                }
+
                 BusConnect();
             }
 
@@ -37,21 +54,31 @@ namespace AZ
 
             void FbxImportRequestHandler::Reflect(ReflectContext* context)
             {
+                SceneImporterSettings::Reflect(context);
+
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<FbxImportRequestHandler, SceneCore::BehaviorComponent>()->Version(1);
+                    serializeContext->Class<FbxImportRequestHandler, AZ::Component>()->Version(1)->Attribute(
+                        AZ::Edit::Attributes::SystemComponentTags,
+                        AZStd::vector<AZ::Crc32>(
+                            {AssetBuilderSDK::ComponentTags::AssetBuilder,
+                            AssetImportRequest::GetAssetImportRequestComponentTag()}));
+                    
                 }
             }
 
             void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions)
             {
-                extensions.insert(s_extension);
+                extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end());
             }
 
             Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester)
             {
-                if (!AzFramework::StringFunc::Path::IsExtension(path.c_str(), s_extension))
+                AZStd::string extension;
+                StringFunc::Path::GetExtension(path.c_str(), extension);
+                
+                if (!m_settings.m_supportedFileTypeExtensions.contains(extension))
                 {
                     return Events::LoadingResult::Ignored;
                 }
@@ -73,6 +100,11 @@ namespace AZ
                     return Events::LoadingResult::AssetFailure;
                 }
             }
+
+            void FbxImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
+            {
+                provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
+            }
         } // namespace Import
     } // namespace SceneAPI
 } // namespace AZ
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
index 8b33051f1e..12c7c6f877 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
@@ -21,12 +21,21 @@ namespace AZ
     {
         namespace FbxSceneImporter
         {
+            struct SceneImporterSettings
+            {
+                AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}");
+                
+                static void Reflect(AZ::ReflectContext* context);
+
+                AZStd::unordered_set<AZStd::string> m_supportedFileTypeExtensions;
+            };
+
             class FbxImportRequestHandler
-                : public SceneCore::BehaviorComponent
+                : public AZ::Component
                 , public Events::AssetImportRequestBus::Handler
             {
             public:
-                AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}", SceneCore::BehaviorComponent);
+                AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}");
 
                 ~FbxImportRequestHandler() override = default;
 
@@ -38,8 +47,13 @@ namespace AZ
                 Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid,
                     RequestingApplication requester) override;
 
+                static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided);
+
             private:
-                static const char* s_extension;
+
+                SceneImporterSettings m_settings;
+
+                static constexpr const char* SettingsFilename = "AssetImporterSettings.json";
             };
         } // namespace FbxSceneImporter
     } // namespace SceneAPI
diff --git a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
index 193a1f9fd5..c0d1fc3bd0 100644
--- a/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
+++ b/Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
@@ -37,7 +37,7 @@ namespace AZ
                 SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
                 if (serializeContext)
                 {
-                    serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(1);
+                    serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(2);
                 }
             }
 
diff --git a/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
index a2f9450bce..2deed280db 100644
--- a/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
+++ b/Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
@@ -71,6 +71,11 @@ namespace AZ
                 static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
                 using MutexType = AZStd::recursive_mutex;
 
+                static AZ::Crc32 GetAssetImportRequestComponentTag()
+                {
+                    return AZ_CRC_CE("AssetImportRequest");
+                }
+                
                 virtual ~AssetImportRequest() = 0;
 
                 //! Fills the given list with all available file extensions, excluding the extension for the manifest.
diff --git a/Code/Tools/SerializeContextTools/SliceConverter.h b/Code/Tools/SerializeContextTools/SliceConverter.h
index 8dba6a0e55..a977095f02 100644
--- a/Code/Tools/SerializeContextTools/SliceConverter.h
+++ b/Code/Tools/SerializeContextTools/SliceConverter.h
@@ -52,7 +52,7 @@ namespace AZ
             static bool ConvertNestedSlices(
                 SliceComponent* sliceComponent, AzToolsFramework::Prefab::Instance* sourceInstance,
                 AZ::SerializeContext* serializeContext, bool isDryRun);
-            static bool SliceConverter::ConvertSliceInstance(
+            static bool ConvertSliceInstance(
                 AZ::SliceComponent::SliceInstance& instance, AZ::Data::Asset<AZ::SliceAsset>& sliceAsset,
                 AzToolsFramework::Prefab::TemplateReference nestedTemplate, AzToolsFramework::Prefab::Instance* topLevelInstance);
             static void PrintPrefab(AzToolsFramework::Prefab::TemplateId templateId);
diff --git a/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
index ab9e65b896..d67260de3e 100644
--- a/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
+++ b/Gems/AssetValidation/Code/Tests/AssetValidationTestShared.h
@@ -152,8 +152,11 @@ struct AssetValidationTest
         {
             AZ::SettingsRegistry::Register(&m_registry);
 
-            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(m_registry);
+            auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            m_registry.Set(projectPathKey, "AutomatedTesting");
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(m_registry);
+
             // Set the engine root to the temporary directory and re-update the runtime file paths
             auto enginePathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
                 + "/engine_path";
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
index 04b015a66f..bf584c4d63 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
@@ -108,11 +108,11 @@ namespace ImageProcessingAtomEditor
         {
             readableString = "PC";
         }
-        else if (platformStrLowerCase == "es3")
+        else if (platformStrLowerCase == "android")
         {
             readableString = "Android";
         }
-        else if (platformStrLowerCase == "osx_gl")
+        else if (platformStrLowerCase == "mac")
         {
             readableString = "macOS";
         }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
index 28c1e78bb6..ef0e7f9619 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #define AZ_TRAIT_IMAGEPROCESSING_BESSEL_FUNCTION_FIRST_ORDER j1
-#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "osx_gl"
+#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "mac"
 #define AZ_TRAIT_IMAGEPROCESSING_DEFINE_DIRECT3D_CONSTANTS 1
 #define AZ_TRAIT_IMAGEPROCESSING_PVRTEXLIB_USE_WINDLL_IMPORT 0
 #define AZ_TRAIT_IMAGEPROCESSING_SQUISH_DO_NOT_USE_FASTCALL 1
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
index 28c1e78bb6..ef0e7f9619 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h
@@ -12,7 +12,7 @@
 #pragma once
 
 #define AZ_TRAIT_IMAGEPROCESSING_BESSEL_FUNCTION_FIRST_ORDER j1
-#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "osx_gl"
+#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "mac"
 #define AZ_TRAIT_IMAGEPROCESSING_DEFINE_DIRECT3D_CONSTANTS 1
 #define AZ_TRAIT_IMAGEPROCESSING_PVRTEXLIB_USE_WINDLL_IMPORT 0
 #define AZ_TRAIT_IMAGEPROCESSING_SQUISH_DO_NOT_USE_FASTCALL 1
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings
index 0417122033..7bce3041b9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /bumptype=none /M=62,18,32,83,50,50 /preset=Diffuse_highQ /mipgentype=kaiser /reduce="es3:0,ios:3,osx_gl:0,pc:4,provo:1" /ser=0
+/autooptimizefile=0 /bumptype=none /M=62,18,32,83,50,50 /preset=Diffuse_highQ /mipgentype=kaiser /reduce="android:0,ios:3,mac:0,pc:4,provo:1" /ser=0
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
index 0b68493198..3a5122f18e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
@@ -25,7 +25,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
@@ -67,7 +67,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
index 3773857e0a..692ef99b1c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
index 530e36038d..4ebe773f0e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset
index 6d6c156683..6049ef5bd4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset
@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
                 "Name": "AlbedoWithOpacity",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
                 "Name": "AlbedoWithOpacity",
                 "RGB_Weight": "CIEXYZ",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
index 4e69ae67f2..56dec20f3e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
@@ -17,7 +17,7 @@
             "PixelFormat": "BC4"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
@@ -43,7 +43,7 @@
                 ],
                 "PixelFormat": "EAC_R11"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset
index f37acd2f9d..2280a06302 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset
@@ -11,7 +11,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
                 "Name": "CloudShadows",
                 "DestColor": "Linear",
@@ -25,7 +25,7 @@
                 "PixelFormat": "EAC_R11",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
                 "Name": "CloudShadows",
                 "DestColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset
index 46327e87ed..5f0480cee7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset
@@ -15,7 +15,7 @@
             "IsColorChart": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
                 "Name": "ColorChart",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                 "PixelFormat": "R8G8B8X8",
                 "IsColorChart": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
                 "Name": "ColorChart",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset
index fe87f49426..abdf6501be 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset
@@ -30,7 +30,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{2174E04B-73BB-4DF1-8961-4900DC3C9D72}",
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
@@ -82,7 +82,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{2174E04B-73BB-4DF1-8961-4900DC3C9D72}",
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
index 2c47f9eaed..f1e43e74b1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
@@ -18,7 +18,7 @@
             "NumberResidentMips": 255
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
                 "FileMasks": [
@@ -46,7 +46,7 @@
                 // Decal Texture Arrays need all mips available immediately for packing. 
                 "NumberResidentMips": 255                       
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset
index 23ec2347cd..991692c5cc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset
@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness",
                 "SourceColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset
index 3145c5cf8a..fec11218e8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset
@@ -17,7 +17,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
                 "SourceColor": "Linear",
@@ -43,7 +43,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
index 86ba9d74c0..520e4ae193 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
@@ -28,7 +28,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{D7B4BEA6-6427-4295-B61B-62776D0056DE}",
                 "Name": "Displacement",
                 "SourceColor": "Linear",
@@ -77,7 +77,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{D7B4BEA6-6427-4295-B61B-62776D0056DE}",
                 "Name": "Displacement",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
index 5a98d2cd30..ffb16482fd 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
@@ -18,7 +18,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
@@ -46,7 +46,7 @@
                 "PixelFormat": "ASTC_6x6",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset
index 9cf32093d1..33d7babf00 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset
@@ -11,7 +11,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0D26B387-2FBA-456D-AB8E-613020BCC7F8}",
                 "Name": "Gradient",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0D26B387-2FBA-456D-AB8E-613020BCC7F8}",
                 "Name": "Gradient",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
index c77c77b988..f06682be42 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B6B04FD3-BD7B-44AC-AD93-6FECD2BD4D76}",
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B6B04FD3-BD7B-44AC-AD93-6FECD2BD4D76}",
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset
index fb4155a974..8bd6b348d1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset
@@ -28,7 +28,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
                 "FileMasks": [
@@ -74,7 +74,7 @@
                     "SubId": 3000
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
index 530eb3d048..402fc470eb 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset
@@ -26,7 +26,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
                 "FileMasks": [
@@ -68,7 +68,7 @@
                     "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset
index db5a9276bd..d940f425c2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset
@@ -30,7 +30,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
                 "FileMasks": [
@@ -80,7 +80,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings b/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
index c8d921a8ff..82a57dd614 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
@@ -5,7 +5,7 @@
     "ClassData": {
         "AnalysisFingerprint": "2",
         "BuildSettings": {
-            "es3": {
+            "android": {
                 "GlossScale": 16.0,
                 "GlossBias": 0.0,
                 "Streaming": false,
@@ -17,7 +17,7 @@
                 "Streaming": false,
                 "Enable": true
             },
-            "osx_gl": {
+            "mac": {
                 "GlossScale": 16.0,
                 "GlossBias": 0.0,
                 "Streaming": false,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset
new file mode 100644
index 0000000000..1bb23c6e96
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_R32F.preset
@@ -0,0 +1,45 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "MultiplatformPresetSettings",
+    "ClassData": {
+        "DefaultPreset": {
+            "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
+            "Name": "LUT_R32F",
+            "FileMasks": ["_lutr32f"],
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "PixelFormat": "R32F"
+        },
+        "PlatformsPresets": {
+            "es3": {
+                "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
+                "Name": "LUT_R32F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "R32F"
+            },
+            "ios": {
+                "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
+                "Name": "LUT_R32F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "R32F"
+            },
+            "osx_gl": {
+                "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
+                "Name": "LUT_R32F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "R32F"
+            },
+            "provo": {
+                "UUID": "{10D4D7D8-23E2-4FC5-BE6A-DA9949D2C603}",
+                "Name": "LUT_R32F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "PixelFormat": "R32F"
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset
index 6bfb697a5e..183653d111 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset
@@ -11,7 +11,7 @@
             "PixelFormat": "R16G16"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{D55CBCD3-AF2D-4515-98AB-E278F6B3B5F6}",
                 "Name": "LUT_RG16",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R16G16"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{D55CBCD3-AF2D-4515-98AB-E278F6B3B5F6}",
                 "Name": "LUT_RG16",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset
index a010d26a9c..2cf0c6ca0a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset
@@ -12,7 +12,7 @@
             "PixelFormat": "R32G32F"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}",
                 "Name": "LUT_RG32F",
                 "SourceColor": "Linear",
@@ -26,7 +26,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R32G32F"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}",
                 "Name": "LUT_RG32F",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset
index ca636f486a..9838d532b2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset
@@ -14,7 +14,7 @@
             "PixelFormat": "R8G8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3791319D-043B-4011-8B6F-3DE96D0C4309}",
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
@@ -34,7 +34,7 @@
                 ],
                 "PixelFormat": "R8G8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3791319D-043B-4011-8B6F-3DE96D0C4309}",
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset
new file mode 100644
index 0000000000..f36d566d7e
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16.preset
@@ -0,0 +1,59 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "MultiplatformPresetSettings",
+    "ClassData": {
+        "DefaultPreset": {
+            "UUID": "{ABDFCED1-0565-4B7B-9BC1-82C473BCEEA2}",
+            "Name": "LUT_RGBA16",
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "FileMasks": [
+                "_lutrgba16"
+            ],
+            "PixelFormat": "R16G16B16A16"
+        },
+        "PlatformsPresets": {
+            "es3": {
+                "UUID": "{ABDFCED1-0565-4B7B-9BC1-82C473BCEEA2}",
+                "Name": "LUT_RGBA16",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16"
+                ],
+                "PixelFormat": "R16G16B16A16"
+            },
+            "ios": {
+                "UUID": "{ABDFCED1-0565-4B7B-9BC1-82C473BCEEA2}",
+                "Name": "LUT_RGBA16",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16"
+                ],
+                "PixelFormat": "R16G16B16A16"
+            },
+            "osx_gl": {
+                "UUID": "{ABDFCED1-0565-4B7B-9BC1-82C473BCEEA2}",
+                "Name": "LUT_RGBA16",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16"
+                ],
+                "PixelFormat": "R16G16B16A16"
+            },
+            "provo": {
+                "UUID": "{ABDFCED1-0565-4B7B-9BC1-82C473BCEEA2}",
+                "Name": "LUT_RGBA16",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16"
+                ],
+                "PixelFormat": "R16G16B16A16"
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset
new file mode 100644
index 0000000000..367c5101b3
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA16F.preset
@@ -0,0 +1,59 @@
+{
+    "Type": "JsonSerialization",
+    "Version": 1,
+    "ClassName": "MultiplatformPresetSettings",
+    "ClassData": {
+        "DefaultPreset": {
+            "UUID": "{6D75F093-C826-437A-AD94-8631A5A4E8A2}",
+            "Name": "LUT_RGBA16F",
+            "SourceColor": "Linear",
+            "DestColor": "Linear",
+            "FileMasks": [
+                "_lutrgba16f"
+            ],
+            "PixelFormat": "R16G16B16A16F"
+        },
+        "PlatformsPresets": {
+            "es3": {
+                "UUID": "{6D75F093-C826-437A-AD94-8631A5A4E8A2}",
+                "Name": "LUT_RGBA16F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16f"
+                ],
+                "PixelFormat": "R16G16B16A16F"
+            },
+            "ios": {
+                "UUID": "{6D75F093-C826-437A-AD94-8631A5A4E8A2}",
+                "Name": "LUT_RGBA16F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16f"
+                ],
+                "PixelFormat": "R16G16B16A16F"
+            },
+            "osx_gl": {
+                "UUID": "{6D75F093-C826-437A-AD94-8631A5A4E8A2}",
+                "Name": "LUT_RGBA16F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16f"
+                ],
+                "PixelFormat": "R16G16B16A16F"
+            },
+            "provo": {
+                "UUID": "{6D75F093-C826-437A-AD94-8631A5A4E8A2}",
+                "Name": "LUT_RGBA16F",
+                "SourceColor": "Linear",
+                "DestColor": "Linear",
+                "FileMasks": [
+                    "_lutrgba16f"
+                ],
+                "PixelFormat": "R16G16B16A16F"
+            }
+        }
+    }
+}
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset
index 717ece058d..3a456825bf 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset
@@ -12,7 +12,7 @@
             "PixelFormat": "R32G32B32A32F"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}",
                 "Name": "LUT_RGBA32F",
                 "SourceColor": "Linear",
@@ -26,7 +26,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R32G32B32A32F"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}",
                 "Name": "LUT_RGBA32F",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset
index 6dbb29f830..49bf33dd84 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset
@@ -10,7 +10,7 @@
             "DestColor": "Linear"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3A6BB297-B610-4EA5-8DA4-610FB12B9EC0}",
                 "Name": "LUT_RGBA8",
                 "SourceColor": "Linear",
@@ -22,7 +22,7 @@
                 "SourceColor": "Linear",
                 "DestColor": "Linear"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3A6BB297-B610-4EA5-8DA4-610FB12B9EC0}",
                 "Name": "LUT_RGBA8",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset
index 9c57f80709..5ce06aaea2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset
@@ -15,7 +15,7 @@
             "PixelFormat": "R8G8B8X8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B1AC2F76-CB1A-46A8-B92D-B8DFBB564FCF}",
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                 ],
                 "PixelFormat": "R8G8B8X8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B1AC2F76-CB1A-46A8-B92D-B8DFBB564FCF}",
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset
index 84294dfbcc..9f4b5bf68d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset
@@ -9,7 +9,7 @@
             "PixelFormat": "BC1"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
                 "Name": "LensOptics",
                 "PixelFormat": "ETC2"
@@ -19,7 +19,7 @@
                 "Name": "LensOptics",
                 "PixelFormat": "ASTC_4x4"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
                 "Name": "LensOptics",
                 "PixelFormat": "BC1"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset
index 8c98394d36..ede264a78e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset
@@ -14,7 +14,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
                 "Name": "LightProjector",
                 "DestColor": "Linear",
@@ -34,7 +34,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
                 "Name": "LightProjector",
                 "DestColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset
index f64c48eb95..ad0e2ddf06 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset
@@ -9,7 +9,7 @@
             "PixelFormat": "R8G8B8X8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"
@@ -19,7 +19,7 @@
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset
index a402a2636c..9370de063d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset
@@ -15,7 +15,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
                 "Name": "Minimap",
                 "SuppressEngineReduce": true,
@@ -37,7 +37,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
                 "Name": "Minimap",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset
index f5ecc58d1a..459cd5b1fb 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset
@@ -14,7 +14,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
                 "Name": "MuzzleFlash",
                 "SuppressEngineReduce": true,
@@ -34,7 +34,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
                 "Name": "MuzzleFlash",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
index 104f3b4a39..04307eada4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset
@@ -27,7 +27,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
                 "Name": "Normals",
                 "SourceColor": "Linear",
@@ -75,7 +75,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
                 "Name": "Normals",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
index c513720b68..46e97c3443 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
@@ -19,7 +19,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
                 "Name": "NormalsFromDisplacement",
                 "SourceColor": "Linear",
@@ -49,7 +49,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
                 "Name": "NormalsFromDisplacement",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
index e773f7d910..b8f6e38ac1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
@@ -25,7 +25,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{6EE749F4-846E-4F7A-878C-F211F85EA59F}",
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
@@ -67,7 +67,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{6EE749F4-846E-4F7A-878C-F211F85EA59F}",
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
index 4cf7af6f29..58bb02cd72 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
@@ -22,7 +22,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
                 "Name": "NormalsWithSmoothness_Legacy",
                 "SourceColor": "Linear",
@@ -58,7 +58,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
                 "Name": "NormalsWithSmoothness_Legacy",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
index 265379d053..bbd7fd5db9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
@@ -27,7 +27,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F3D5E572-A3CF-435A-A2AB-75D2B6907847}",
                 "Name": "Opacity",
                 "SourceColor": "Linear",
@@ -73,7 +73,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F3D5E572-A3CF-435A-A2AB-75D2B6907847}",
                 "Name": "Opacity",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset
index 03744dee9e..e51848a116 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset
@@ -8,7 +8,7 @@
             "Name": "ReferenceImage"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },
@@ -16,7 +16,7 @@
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset
index 4d75e7ae1d..d9b9c17d07 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset
@@ -13,7 +13,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{46D9F30F-793C-4449-BCEF-12A396E61B2C}",
                 "Name": "ReferenceImage_HDRLinear",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{46D9F30F-793C-4449-BCEF-12A396E61B2C}",
                 "Name": "ReferenceImage_HDRLinear",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset
index 8344102425..8a5a83afa3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset
@@ -13,7 +13,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{EEF24422-C8F0-4ECE-B32A-C70DB8129466}",
                 "Name": "ReferenceImage_HDRLinearUncompressed",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "R16G16B16A16F",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{EEF24422-C8F0-4ECE-B32A-C70DB8129466}",
                 "Name": "ReferenceImage_HDRLinearUncompressed",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset
index 515e9b0512..bf72f21b06 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset
@@ -11,7 +11,7 @@
             "SuppressEngineReduce": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{02C3D9F5-3637-49BA-A48A-D68D629A4D14}",
                 "Name": "ReferenceImage_Linear",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{02C3D9F5-3637-49BA-A48A-D68D629A4D14}",
                 "Name": "ReferenceImage_Linear",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
index 58e283add7..1844e0186e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
@@ -34,7 +34,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
                 "Name": "Reflectance",
                 "SourceColor": "Linear",
@@ -92,7 +92,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
                 "Name": "Reflectance",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
index e386d08a35..e51cc7122b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
@@ -16,7 +16,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
                 "Name": "ReflectanceWithSmoothness_Legacy",
                 "FileMasks": [
@@ -40,7 +40,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
                 "Name": "ReflectanceWithSmoothness_Legacy",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
index 767b0b67eb..07cc39c955 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
                 "Name": "Reflectance_Linear",
                 "DestColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
                 "Name": "Reflectance_Linear",
                 "DestColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset
index b2bbf905db..f76741148c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset
@@ -12,7 +12,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
                 "Name": "SF_Font",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
                 "Name": "SF_Font",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset
index 41ba10f55c..aff25dc83d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset
@@ -12,7 +12,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
                 "Name": "SF_Gradient",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
                 "Name": "SF_Gradient",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset
index e36e42860d..46a32ce5d4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset
@@ -13,7 +13,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
                 "Name": "SF_Image",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "PVRTC4",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
                 "Name": "SF_Image",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset
index fa2fe2ae72..0ba70d2ca3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset
@@ -12,7 +12,7 @@
             "PixelFormat": "BC1"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
                 "Name": "SF_Image_nonpower2",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "PVRTC4"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
                 "Name": "SF_Image_nonpower2",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset
index 9102bd53bb..4f71855ecf 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset
@@ -21,7 +21,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
                 "FileMasks": [
@@ -55,7 +55,7 @@
                     "RequiresConvolve": false
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
                 "FileMasks": [
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset
index 19881f93d7..84a70935f1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset
@@ -16,7 +16,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
                 "Name": "Terrain_Albedo",
                 "SourceColor": "Linear",
@@ -40,7 +40,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
                 "Name": "Terrain_Albedo",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset
index 2fcbb012d4..1d83737ef9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset
@@ -15,7 +15,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
                 "Name": "Terrain_Albedo_HighPassed",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
                 "Name": "Terrain_Albedo_HighPassed",
                 "SourceColor": "Linear",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset
index d0dbbcba6f..6e28cafe11 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset
@@ -13,7 +13,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
                 "Name": "Uncompressed",
                 "PixelFormat": "R8G8B8X8",
@@ -31,7 +31,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
                 "Name": "Uncompressed",
                 "PixelFormat": "R8G8B8X8",
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
index 01595a3425..6f70e8f14f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
@@ -13,7 +13,7 @@
             "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
                 "Name": "UserInterface_Compressed",
                 "SuppressEngineReduce": true,
@@ -25,7 +25,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "ASTC_6x6"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
                 "Name": "UserInterface_Compressed",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
index 78c63790ab..39066b242b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset
@@ -13,7 +13,7 @@
             "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
@@ -25,7 +25,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R8G8B8A8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
diff --git a/Gems/Atom/Asset/Shader/Code/CMakeLists.txt b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
index a06aa79d24..dd8afec534 100644
--- a/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
+++ b/Gems/Atom/Asset/Shader/Code/CMakeLists.txt
@@ -101,3 +101,36 @@ ly_add_target(
         3rdParty::SPIRVCross
         3rdParty::azslc
 )
+
+################################################################################
+# Tests
+################################################################################
+if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
+
+    ly_add_target(
+        NAME Atom_Asset_Shader.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+        NAMESPACE Gem
+        FILES_CMAKE
+            atom_asset_shader_builders_tests_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                .
+                Source/Editor
+                Tests
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AtomCore
+                AZ::AzTest
+                AZ::AzFramework
+                AZ::AzToolsFramework
+                Legacy::CryCommon
+                Gem::Atom_RPI.Public
+                Gem::Atom_RHI.Public
+                Gem::Atom_RPI.Edit
+                Gem::Atom_Asset_Shader.Static
+    )
+    ly_add_googletest(
+        NAME Gem::Atom_Asset_Shader.Tests
+    )
+
+endif()
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
index 1e471f8644..14193d774f 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/CommonFiles/Preprocessor.cpp
@@ -60,33 +60,31 @@ namespace AZ
 
         void PreprocessorOptions::RemovePredefinedMacros(const AZStd::vector<AZStd::string>& macroNames)
         {
+            for (const auto& macroName : macroNames)
+            {
                 m_predefinedMacros.erase(
                     AZStd::remove_if(
                         m_predefinedMacros.begin(), m_predefinedMacros.end(),
-                        [&](const AZStd::string& predefinedMacro)
-                        {
-                            for (const auto& macroName : macroNames)
+                        [&](const AZStd::string& predefinedMacro) {
+                            //                                       Haystack,        needle,    bCaseSensitive
+                            if (!AzFramework::StringFunc::StartsWith(predefinedMacro, macroName, true))
                             {
-                                //                                       Haystack,        needle,    bCaseSensitive
-                                if (!AzFramework::StringFunc::StartsWith(predefinedMacro, macroName, true))
-                                {
-                                    return false;
-                                }
-                                // If found, let's make sure it is not just a substring. 
-                                if (predefinedMacro.size() == macroName.size())
-                                {
-                                    return true;
-                                }
-                                // The predefinedMacro can be a string like "macro=value". If we find '=' it is a match.
-                                if (predefinedMacro.c_str()[macroName.size()] == '=')
-                                {
-                                    return true;
-                                }
                                 return false;
                             }
+                            // If found, let's make sure it is not just a substring.
+                            if (predefinedMacro.size() == macroName.size())
+                            {
+                                return true;
+                            }
+                            // The predefinedMacro can be a string like "macro=value". If we find '=' it is a match.
+                            if (predefinedMacro.c_str()[macroName.size()] == '=')
+                            {
+                                return true;
+                            }
                             return false;
                         }),
                     m_predefinedMacros.end());
+            }
         }
 
         //! Binder helper to Matsui C-Pre-Processor library
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder2.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder2.cpp
index 1668b57866..5758db1da2 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder2.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderAssetBuilder2.cpp
@@ -344,8 +344,7 @@ namespace AZ
                 AZStd::string prependedAzslFilePath = RHI::PrependFile(args);
                 if (prependedAzslFilePath == azslFullPath)
                 {
-                    // For some reason the combined azsl file was not created in the temporary
-                    // directory assigned to this job.
+                    // The specific error is already reported by RHI::PrependFile().
                     response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Failed;
                     return;
                 }
diff --git a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
index a20b9c869b..c256caac4a 100644
--- a/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
+++ b/Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
@@ -736,13 +736,13 @@ namespace AZ
                 {
                     platformId = AzFramework::PlatformId::PC;
                 }
-                else if (platformIdentifier == "osx_gl")
+                else if (platformIdentifier == "mac")
                 {
-                    platformId = AzFramework::PlatformId::OSX;
+                    platformId = AzFramework::PlatformId::MAC_ID;
                 }
-                else if (platformIdentifier == "es3")
+                else if (platformIdentifier == "android")
                 {
-                    platformId = AzFramework::PlatformId::ES3;
+                    platformId = AzFramework::PlatformId::ANDROID_ID;
                 }
                 else if (platformIdentifier == "ios")
                 {
@@ -788,13 +788,13 @@ namespace AZ
                 {
                     platformId = AzFramework::PlatformId::PC;
                 }
-                else if (platform == "osx_gl")
+                else if (platform == "mac")
                 {
-                    platformId = AzFramework::PlatformId::OSX;
+                    platformId = AzFramework::PlatformId::MAC_ID;
                 }
-                else if (platform == "es3")
+                else if (platform == "android")
                 {
-                    platformId = AzFramework::PlatformId::ES3;
+                    platformId = AzFramework::PlatformId::ANDROID_ID;
                 }
                 else if (platform == "ios")
                 {
@@ -886,7 +886,7 @@ namespace AZ
             }
 
             RHI::Ptr<RHI::PipelineLayoutDescriptor> BuildPipelineLayoutDescriptorForApi(
-                const char* builderName, const RPI::ShaderResourceGroupLayoutList& srgLayoutList, const MapOfStringToStageType& shaderEntryPoints,
+                [[maybe_unused]] const char* builderName, const RPI::ShaderResourceGroupLayoutList& srgLayoutList, const MapOfStringToStageType& shaderEntryPoints,
                 const RHI::ShaderCompilerArguments& shaderCompilerArguments, const RootConstantData& rootConstantData,
                 RHI::ShaderPlatformInterface* shaderPlatformInterface, BindingDependencies& bindingDependencies /*inout*/)
             {
diff --git a/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp
new file mode 100644
index 0000000000..276c225e05
--- /dev/null
+++ b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.cpp
@@ -0,0 +1,41 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "ShaderBuilderTestFixture.h"
+
+#include <AzCore/Memory/PoolAllocator.h>
+#include <AzCore/Name/NameDictionary.h>
+
+namespace UnitTest
+{
+    void ShaderBuilderTestFixture::SetUp()
+    {
+        AllocatorsTestFixture::SetUp();
+
+        AZ::AllocatorInstance<AZ::PoolAllocator>::Create();
+        AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Create();
+
+        AZ::NameDictionary::Create();
+    }
+
+    void ShaderBuilderTestFixture::TearDown()
+    {
+        AZ::NameDictionary::Destroy();
+
+        AZ::AllocatorInstance<AZ::ThreadPoolAllocator>::Destroy();
+        AZ::AllocatorInstance<AZ::PoolAllocator>::Destroy();
+
+        AllocatorsTestFixture::TearDown();
+    }
+
+}
+
diff --git a/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h
new file mode 100644
index 0000000000..450cc6bde5
--- /dev/null
+++ b/Gems/Atom/Asset/Shader/Code/Tests/Common/ShaderBuilderTestFixture.h
@@ -0,0 +1,34 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzCore/UnitTest/TestTypes.h>
+
+namespace UnitTest
+{
+    /**
+     * Unit test fixture for setting up memory allocation pools and the AZ::Name dictionary.
+     * In the future will be extended as needed.
+     */
+    class ShaderBuilderTestFixture
+        : public AllocatorsTestFixture
+    {
+    protected:
+        ///////////////////////////////////////////////////////////////////////
+        // AllocatorsTestFixture overrides
+        void SetUp() override;
+        void TearDown() override;
+        ///////////////////////////////////////////////////////////////////////
+    };
+} // namespace UnitTest
+
diff --git a/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp b/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp
new file mode 100644
index 0000000000..2e5ee3fc09
--- /dev/null
+++ b/Gems/Atom/Asset/Shader/Code/Tests/SupervariantCmdArgumentTests.cpp
@@ -0,0 +1,523 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzTest/AzTest.h>
+#include <AzCore/UnitTest/TestTypes.h>
+#include <AzCore/std/algorithm.h>
+
+#include <Atom/RPI.Edit/Common/JsonUtils.h>
+#include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
+#include <Atom/RHI.Edit/Utils.h>
+
+#include <CommonFiles/GlobalBuildOptions.h>
+
+#include "Common/ShaderBuilderTestFixture.h"
+
+namespace UnitTest
+{
+    using namespace AZ;
+
+    struct KeyValueView
+    {
+        AZStd::string_view m_key;
+        AZStd::string_view m_value;
+    };
+
+    class SupervariantCmdArgumentTests : public ShaderBuilderTestFixture
+    {
+    protected:
+        static constexpr char MCPP_MACRO1[] = "MACRO1";
+        static constexpr char MCPP_VALUE1[] = "VALUE1a";
+        static constexpr char MCPP_NEW_VALUE1[] = "VALUE1b"; // Missing A is not a typo
+
+        static constexpr char MCPP_MACRO2[] = "MACRO2";
+        static constexpr char MCPP_VALUE2[] = "VALUE2";
+
+        static constexpr char MCPP_MACRO3[] = "MACRO3";
+        static constexpr char MCPP_VALUE3[] = "VALUE3a";
+        static constexpr char MCPP_NEW_VALUE3[] = "VALUE3b";
+
+        static constexpr char MCPP_MACRO4[] = "MACRO4";
+
+        static constexpr char MCPP_MACRO5[] = "MACRO5";
+
+        static constexpr char MCPP_MACRO6[] = "MACRO6";
+        static constexpr char MCPP_VALUE6[] = "VALUE6";
+
+        static constexpr char AZSLC_ARG1[] = "--azsl1";
+
+        static constexpr char AZSLC_ARG2[] = "--azsl2";
+        static constexpr char AZSLC_VAL2[] = "open,source";
+        static constexpr char AZSLC_NEW_VAL2a[] = "closed,binary";
+        static constexpr char AZSLC_NEW_VAL2b[] = "closed,source";
+
+        static constexpr char AZSLC_ARG3[] = "--azsl3";
+        static constexpr char AZSLC_VAL3[] = "blue";
+
+        static constexpr char AZSLC_ARG4[] = "-azsl4";
+
+        static constexpr char AZSLC_ARG5[] = "--azsl5";
+        static constexpr char AZSLC_VAL5[] = "smith,wick,john,45,-1,-1";
+        static constexpr char AZSLC_NEW_VAL5[] = "apple,seed,crisp,-1,2,0";
+
+        static constexpr char AZSLC_ARG6[] = "--azsl6";
+
+        static constexpr char AZSLC_ARG7[] = "--azsl7";
+
+        //! Helper function.
+        //! Given an input list of {Key, Value} pairs returns a list of strings where each string is of the form: "Key=Value". 
+        AZStd::vector<AZStd::string> CreateListOfStringsFromListOfKeyValues(AZStd::array_view<KeyValueView> listOfKeyValues) const
+        {
+            AZStd::vector<AZStd::string> listOfStrings;
+            for (const auto& keyValue : listOfKeyValues)
+            {
+                if (keyValue.m_value.empty())
+                {
+                    listOfStrings.push_back(keyValue.m_key);
+                }
+                else
+                {
+                    listOfStrings.push_back(AZStd::string::format("%s=%s", keyValue.m_key.data(), keyValue.m_value.data()));
+                }
+            }
+            return listOfStrings;
+        }
+
+        //! Helper function.
+        //! Given an input list of {Key, Value} pairs returns a list of strings where each string is of the form: "Key1", "Value1", "Key2", "Value2". 
+        AZStd::vector<AZStd::string> CreateListOfSingleStringsFromListOfKeyValues(AZStd::array_view<KeyValueView> listOfKeyValues) const
+        {
+            AZStd::vector<AZStd::string> listOfStrings;
+            for (const auto& keyValue : listOfKeyValues)
+            {
+                listOfStrings.push_back(keyValue.m_key);
+                if (!keyValue.m_value.empty())
+                {
+                    listOfStrings.push_back(keyValue.m_value);
+                }
+            }
+            return listOfStrings;
+        }
+
+        //! Helper function.
+        //! @param outputString: [out] The string " @argName" gets appended to it (The space is intentional).
+        //!                      Alternatively, if @argValue is NOT empty, then the string " @argName=@argValue" is
+        //!                      appended to it.
+        //! @param argName: A typical command line argument. "-p" or "--some".
+        //! @param argValue: A string representing the value that should be appended to @argName.
+        void AppendCmdLineArgument(AZStd::string& outputString, AZStd::string_view argName, AZStd::string_view argValue) const
+        {
+            if (argValue.empty())
+            {
+                outputString += AZStd::string::format(" %s", argName.data());
+            }
+            else
+            {
+                outputString += AZStd::string::format(" %s=%s", argName.data(), argValue.data());
+            }
+        }
+
+        //! Helper function.
+        //! Similar to above, but assumes that @argName refers to just the name of a macro definition so the appended string will always start
+        //! with "-D". 
+        void AppendMacroDefinitionArgument(AZStd::string& outputString, AZStd::string_view argName, AZStd::string_view argValue) const
+        {
+            AppendCmdLineArgument(outputString, AZStd::string::format("-D%s", argName.data()), argValue);
+        }
+
+        //! A helper made of helpers.
+        //! Returns a command line string that results of concatenating the input list of {Key, Value} pairs (with '=').
+        //! Example of a returned string:
+        //! "key1=value1 key2 key3 key4=value" 
+        AZStd::string CreateCmdLineStringFromListOfKeyValues(AZStd::array_view<KeyValueView> listOfKeyValues) const
+        {
+            AZStd::string cmdLineString;
+            for (const auto& keyValueView : listOfKeyValues)
+            {
+                AppendCmdLineArgument(cmdLineString, keyValueView.m_key, keyValueView.m_value);
+            }
+            return cmdLineString;
+        }
+
+        //! A helper made of helpers.
+        //! Returns a command line string of macro definitions that results of concatenating the input list of {Key, Value} pairs.
+        //! Example of a returned string:
+        //! "-Dkey1=value1 -Dkey2 -Dkey3 -Dkey4=value"
+        AZStd::string CreateMacroDefinitionCmdLineStringFromListOfKeyValues(AZStd::array_view<KeyValueView> listOfKeyValues) const
+        {
+            AZStd::string cmdLineString;
+            for (const auto& keyValueView : listOfKeyValues)
+            {
+                AppendMacroDefinitionArgument(cmdLineString, keyValueView.m_key, keyValueView.m_value);
+            }
+            return cmdLineString;
+        }
+
+        //! @param includePaths A List of folder paths
+        //! @param predefinedMacros A List of strings with format: "name[=value]"
+        ShaderBuilder::PreprocessorOptions CreatePreprocessorOptions(
+            AZStd::array_view<AZStd::string> includePaths, AZStd::array_view<AZStd::string> predefinedMacros) const
+        {
+            ShaderBuilder::PreprocessorOptions preprocessorOptions;
+
+            preprocessorOptions.m_projectIncludePaths.reserve(includePaths.size());
+            for (const auto& path : includePaths)
+            {
+                preprocessorOptions.m_projectIncludePaths.push_back(path);
+            }
+
+            preprocessorOptions.m_predefinedMacros.reserve(predefinedMacros.size());
+            for (const auto& macro : predefinedMacros)
+            {
+                preprocessorOptions.m_predefinedMacros.push_back(macro);
+            }
+
+            return preprocessorOptions;
+        }
+
+        //! @param azslcAdditionalFreeArguments: A string representing series of command line arguments for AZSLc.
+        //! @param dxcAdditionalFreeArguments: A string representing series of command line arguments for DXC.
+        RHI::ShaderCompilerArguments CreateShaderCompilerArguments(
+            AZStd::string_view azslcAdditionalFreeArguments, AZStd::string_view dxcAdditionalFreeArguments) const
+        {
+            RHI::ShaderCompilerArguments shaderCompilerArguments;
+            shaderCompilerArguments.m_azslcWarningLevel = 1;
+            shaderCompilerArguments.m_azslcAdditionalFreeArguments = azslcAdditionalFreeArguments;
+            shaderCompilerArguments.m_defaultMatrixOrder = RHI::MatrixOrder::Row;
+            shaderCompilerArguments.m_dxcAdditionalFreeArguments = dxcAdditionalFreeArguments;
+
+            return shaderCompilerArguments;
+        }
+
+
+        //! @param includePaths A List of folder paths
+        //! @param predefinedMacros A List of strings with format: "name[=value]"
+        //! @param azslcAdditionalFreeArguments A string representing series of command line arguments for AZSLc.
+        //! @param dxcAdditionalFreeArguments: A string representing series of command line arguments for DXC.
+        ShaderBuilder::GlobalBuildOptions CreateGlobalBuildOptions(
+            AZStd::array_view<AZStd::string> includePaths,
+            AZStd::array_view<AZStd::string> predefinedMacros,
+            AZStd::string_view azslcAdditionalFreeArguments,
+            AZStd::string_view dxcAdditionalFreeArguments) const
+        {
+            ShaderBuilder::GlobalBuildOptions globalBuildOptions;
+            globalBuildOptions.m_preprocessorSettings = CreatePreprocessorOptions(includePaths, predefinedMacros);
+            globalBuildOptions.m_compilerArguments =
+                CreateShaderCompilerArguments(azslcAdditionalFreeArguments, dxcAdditionalFreeArguments);
+            return globalBuildOptions;
+        }
+
+        //! @param name Name of the supervariant.
+        //! @param plusArguments A string with command line arguments that contains both C-preprocessor macro definitions
+        //!        and other command line arguments for AZSLc.
+        //! @param minusArguments A string with command line arguments that should be removed from the finalized command line arguments.
+        //!        it can contain both, C-preprocessor macro definitions and other command line arguments for AZSLc.
+        RPI::ShaderSourceData::SupervariantInfo CreateSupervariantInfo(
+            AZStd::string_view name, AZStd::string_view plusArguments, AZStd::string_view minusArguments) const
+        {
+            RPI::ShaderSourceData::SupervariantInfo supervariantInfo;
+            supervariantInfo.m_name = name;
+            supervariantInfo.m_plusArguments = plusArguments;
+            supervariantInfo.m_minusArguments = minusArguments;
+            return supervariantInfo;
+        }
+
+        bool StringContainsAllSubstrings(AZStd::string_view haystack, AZStd::array_view<AZStd::string> substrings)
+        {
+            return AZStd::all_of(AZ_BEGIN_END(substrings),
+                [&](AZStd::string_view needle) -> bool
+                {
+                    return (haystack.find(needle) != AZStd::string::npos);
+                }
+            );
+        }
+
+        bool StringDoesNotContainAnyOneOfTheSubstrings(AZStd::string_view haystack, AZStd::array_view<AZStd::string> substrings)
+        {
+            return AZStd::all_of(AZ_BEGIN_END(substrings), [&](AZStd::string_view needle) -> bool {
+                return (haystack.find(needle) == AZStd::string::npos);
+            });
+        }
+
+        //! @returns: True if all strings in @substring appear in @vectorOfString.
+        //! @remark: Keep in mind that this is not the same as saying that all strings in @vectorOfStrings appear in @substrings.
+        bool VectorContainsAllSubstrings(
+            AZStd::array_view<AZStd::string> vectorOfStrings, AZStd::array_view<AZStd::string> substrings)
+        {
+            return AZStd::all_of(
+                AZ_BEGIN_END(substrings),
+                [&](AZStd::string_view needle) -> bool {
+                bool res = AZStd::any_of(AZ_BEGIN_END(vectorOfStrings),
+                        [&](AZStd::string_view haystack) -> bool
+                        {
+                            return haystack.find(needle) != AZStd::string::npos;
+                        }
+                    );
+                    return res;
+                }
+            );
+        }
+
+        //! @returns: True only if None of the strings in @vectorOfStrings contains any of the strings in @substrings.
+        bool VectorDoesNotContainAnyOneOfTheSubstrings(AZStd::array_view<AZStd::string> vectorOfStrings, AZStd::array_view<AZStd::string> substrings)
+        {
+            return AZStd::all_of(AZ_BEGIN_END(vectorOfStrings), [&](AZStd::string_view haystack) -> bool {
+                return StringDoesNotContainAnyOneOfTheSubstrings(haystack, substrings);
+            });
+        }
+
+    }; // class SupervariantCmdArgumentTests
+
+
+    TEST_F(SupervariantCmdArgumentTests, CommandLineArgumentUtils_ValidateHelperFunctions)
+    {
+        // In this test the idea is to validate the static helper functions in AZ::RHI::ShaderCompilerArguments class
+        // that are useful for command line argument manipulation, etc.
+        AZStd::vector<KeyValueView> argumentList = {
+            {AZSLC_ARG1, ""}, {AZSLC_ARG2, AZSLC_VAL2}, {AZSLC_ARG3, AZSLC_VAL3}, {AZSLC_ARG4, ""}, {AZSLC_ARG5, AZSLC_VAL5},
+        };
+
+        auto argumentsAsString = CreateCmdLineStringFromListOfKeyValues(argumentList);
+        auto listOfArgumentNames = AZ::RHI::CommandLineArgumentUtils::GetListOfArgumentNames(argumentsAsString);
+
+        EXPECT_TRUE(AZStd::all_of(AZ_BEGIN_END(argumentList), [&](const KeyValueView& needle) -> bool {
+            return (AZStd::find(AZ_BEGIN_END(listOfArgumentNames), needle.m_key) != listOfArgumentNames.end()) &&
+                   // Make sure the values did not make into the expected list of keys.
+                   (AZStd::find(AZ_BEGIN_END(listOfArgumentNames), needle.m_value) == listOfArgumentNames.end());
+        }));
+
+        AZStd::vector<AZStd::string> listOfArgumentsToRemove = { AZSLC_ARG4, AZSLC_ARG2 };
+        auto stringWithRemovedArguments =
+            AZ::RHI::CommandLineArgumentUtils::RemoveArgumentsFromCommandLineString(listOfArgumentsToRemove, argumentsAsString);
+        EXPECT_TRUE(AZStd::all_of(AZ_BEGIN_END(listOfArgumentsToRemove), [&](const AZStd::string& needle) -> bool {
+            return stringWithRemovedArguments.find(needle) == AZStd::string::npos;
+        }));
+
+        AZStd::vector<AZStd::string> listOfSurvivingArguments = {AZSLC_ARG1, AZSLC_ARG3, AZSLC_ARG5};
+        EXPECT_TRUE(AZStd::all_of(AZ_BEGIN_END(listOfSurvivingArguments), [&](const AZStd::string& needle) -> bool {
+            return stringWithRemovedArguments.find(needle) != AZStd::string::npos;
+        }));
+
+        auto stringWithoutExtraSpaces =
+            AZ::RHI::CommandLineArgumentUtils::RemoveExtraSpaces("  --arg1   -arg2     --arg3=foo --arg4=bar  ");
+        EXPECT_EQ(stringWithoutExtraSpaces, AZStd::string("--arg1 -arg2 --arg3=foo --arg4=bar"));
+
+        auto stringAsMergedArguments =
+            AZ::RHI::CommandLineArgumentUtils::MergeCommandLineArguments("--arg1 -arg2 --arg3=foo", "--arg3=bar --arg4");
+        EXPECT_EQ(stringAsMergedArguments, AZStd::string("--arg1 -arg2 --arg3=bar --arg4"));
+
+        EXPECT_TRUE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("-DMACRO"));
+        EXPECT_TRUE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("-D MACRO"));
+        EXPECT_TRUE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--help -D MACRO"));
+        EXPECT_TRUE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--help -p -DMACRO --more"));
+        EXPECT_TRUE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--help -p -D MACRO=VALUE --more"));
+        EXPECT_FALSE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--help -p --more"));
+        EXPECT_FALSE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--help -p --more --DFAKE"));
+        EXPECT_FALSE(AZ::RHI::CommandLineArgumentUtils::HasMacroDefinitions("--DFAKE1 --help -p --more --D FAKE2"));
+    }
+
+    TEST_F(SupervariantCmdArgumentTests, ShaderCompilerArguments_ValidateCommandLineArgumentsMerge)
+    {
+        // In this test we validate that AZ::RHI::ShaderCompilerArguments::Merge() works as expected
+        // by merging AZSLC & DXC arguments giving higher priority to the arguments in the "right".
+
+        auto shaderCompilerArgumentsLeft = CreateShaderCompilerArguments(
+            "--azsl1 --azsl2=avalue2a -azsl3 --azsl4=avalue4a",
+            "--dxc1=dvalue1a -dxc2 --dxc3=dvalue3a --dxc4");
+        auto shaderCompilerArgumentsRight = CreateShaderCompilerArguments(
+            "--azsl1 --azsl2=avalue2b -azsl3 --azsl4=avalue4a --azsl5",
+            "--dxc1=dvalue1a -dxc2 --dxc3=dvalue3b --dxc4 --dxc5=dvalue5a");
+
+        shaderCompilerArgumentsLeft.Merge(shaderCompilerArgumentsRight);
+        EXPECT_EQ(shaderCompilerArgumentsLeft.m_azslcAdditionalFreeArguments, "--azsl1 --azsl2=avalue2b -azsl3 --azsl4=avalue4a --azsl5");
+        EXPECT_EQ(shaderCompilerArgumentsLeft.m_dxcAdditionalFreeArguments, "--dxc1=dvalue1a -dxc2 --dxc3=dvalue3b --dxc4 --dxc5=dvalue5a");
+    }
+
+
+    TEST_F(SupervariantCmdArgumentTests, SupervariantInfo_ValidateMemberFunctions)
+    {
+        // In this test all member functions of the ShaderSourceData::SupervariantInfo class
+        // are validated.
+
+        AZStd::vector<KeyValueView> mcppMacrosList = {
+            {MCPP_MACRO1, MCPP_VALUE1},
+            {MCPP_MACRO2, MCPP_VALUE2},
+            {MCPP_MACRO3, MCPP_VALUE3},
+            {MCPP_MACRO4, ""},
+        };
+
+        AZStd::string argumentsToAddOrReplace;
+        AppendMacroDefinitionArgument(argumentsToAddOrReplace, MCPP_MACRO3, MCPP_NEW_VALUE3);
+        AppendCmdLineArgument(argumentsToAddOrReplace, AZSLC_ARG2, AZSLC_NEW_VAL2a);
+        AppendMacroDefinitionArgument(argumentsToAddOrReplace, MCPP_MACRO1, MCPP_NEW_VALUE1);
+        AppendCmdLineArgument(argumentsToAddOrReplace, AZSLC_ARG5, AZSLC_NEW_VAL5);
+        AppendMacroDefinitionArgument(argumentsToAddOrReplace, MCPP_MACRO5, "");
+        AppendCmdLineArgument(argumentsToAddOrReplace, AZSLC_ARG6, "");
+
+        AZStd::string argumentsToRemove;
+        AppendCmdLineArgument(argumentsToRemove, AZSLC_ARG3, "");
+        AppendMacroDefinitionArgument(argumentsToRemove, MCPP_MACRO2, "");
+        AppendCmdLineArgument(argumentsToRemove, AZSLC_ARG4, "");
+        AppendMacroDefinitionArgument(argumentsToRemove, MCPP_MACRO4, "");
+
+        auto supervariantInfo = CreateSupervariantInfo("Dummy", argumentsToAddOrReplace, argumentsToRemove);
+
+        auto macroListToRemove = supervariantInfo.GetCombinedListOfMacroDefinitionNamesToRemove();
+        AZStd::vector<AZStd::string> macroNamesToRemoveThatMustBePresent = { MCPP_MACRO1, MCPP_MACRO2, MCPP_MACRO3, MCPP_MACRO4, MCPP_MACRO5 };
+        EXPECT_EQ(macroListToRemove.size(), macroNamesToRemoveThatMustBePresent.size());
+        EXPECT_TRUE(
+            VectorContainsAllSubstrings(macroListToRemove, macroNamesToRemoveThatMustBePresent)
+        );
+
+        auto macroListToAdd = supervariantInfo.GetMacroDefinitionsToAdd();
+        AZStd::vector<AZStd::string> macroNamesToAddThatMustBePresent = {MCPP_MACRO1, MCPP_MACRO3, MCPP_MACRO5};
+        EXPECT_EQ(macroListToAdd.size(), macroNamesToAddThatMustBePresent.size());
+        EXPECT_TRUE(VectorContainsAllSubstrings(macroListToAdd, macroNamesToAddThatMustBePresent));
+
+        // The result of GetCustomizedArgumentsForAzslc() is the most important value to test
+        AZStd::vector<KeyValueView> freeAzslcArgumentList = {
+            {AZSLC_ARG1, ""}, {AZSLC_ARG2, AZSLC_VAL2}, {AZSLC_ARG3, AZSLC_VAL3}, {AZSLC_ARG4, ""}, {AZSLC_ARG5, AZSLC_VAL5},
+        };
+        AZStd::string azslcArgs = CreateCmdLineStringFromListOfKeyValues(freeAzslcArgumentList);
+        AZStd::string customizedAzslcArgs = supervariantInfo.GetCustomizedArgumentsForAzslc(azslcArgs);
+
+        AZStd::vector<AZStd::string> stringsThatMustBePresent = {
+            AZSLC_ARG1, AZSLC_ARG2, AZSLC_NEW_VAL2a, AZSLC_ARG5, AZSLC_NEW_VAL5, AZSLC_ARG6};
+        EXPECT_TRUE(StringContainsAllSubstrings(customizedAzslcArgs, stringsThatMustBePresent));
+
+        AZStd::vector<AZStd::string> stringsThatCanNotBePresent = { AZSLC_ARG3, AZSLC_VAL3, AZSLC_ARG4,
+            // Because GetCustomizedArgumentsForAzslc() only returns arguments for AZSLc, none of the macro related
+            // arguments can be present
+            MCPP_MACRO1, MCPP_VALUE1, MCPP_NEW_VALUE1,
+            MCPP_MACRO2, MCPP_VALUE2,
+            MCPP_MACRO3, MCPP_VALUE3, MCPP_NEW_VALUE3,
+            MCPP_MACRO4,
+            MCPP_MACRO5
+        };
+
+        EXPECT_TRUE(
+            StringDoesNotContainAnyOneOfTheSubstrings(customizedAzslcArgs, stringsThatCanNotBePresent)
+        );
+    }
+
+
+    TEST_F(SupervariantCmdArgumentTests, ShaderAssetBuilder_ValidateInfluenceOfSupervariantInfoOnGlobalBuildOptions)
+    {
+        // In this test we validate how the ShaderAssetBuilder configure the commmand line arguments it passes
+        // to MCPP, AZSLc & DXC. It basically starts with a GlobalBuildOptions, that gets further customized by
+        // the ShaderCompilerArguments from ShaderSourceData(.shader file) and later further customized
+        // by each SupervariantInfo in ShaderSourceData.
+
+        // The first step is to define the initial values of the GlobalBuildOptions.
+        AZStd::vector<KeyValueView> globalMcppMacrosList = {
+            {MCPP_MACRO1, MCPP_VALUE1},
+            {MCPP_MACRO2, MCPP_VALUE2},
+            {MCPP_MACRO3, MCPP_VALUE3},
+            {MCPP_MACRO4, ""},
+        };
+
+        AZStd::vector<KeyValueView> globalAzslArguments = {
+            {AZSLC_ARG1, ""},
+            {AZSLC_ARG2, AZSLC_VAL2},
+            {AZSLC_ARG3, AZSLC_VAL3},
+            {AZSLC_ARG4, ""},
+            {AZSLC_ARG5, AZSLC_VAL5},
+        };
+
+        auto globalBuildOptions = CreateGlobalBuildOptions(
+            AZStd::vector<AZStd::string>(), CreateListOfStringsFromListOfKeyValues(globalMcppMacrosList),
+            CreateCmdLineStringFromListOfKeyValues(globalAzslArguments),
+            "" /* Don't care about DXC in this test */);
+
+        // The second step is to load the Shader Compiler Arguments from the .shader file.
+        // These arguments will be merged in @globalBuildOptions, but the .shader arguments have
+        // higher priority.
+        AZStd::vector<KeyValueView> shaderAzslArguments = {
+            {AZSLC_ARG2, AZSLC_NEW_VAL2a},
+            {AZSLC_ARG6, ""},
+        };
+        auto shaderCompilerArguments = CreateShaderCompilerArguments(
+            CreateCmdLineStringFromListOfKeyValues(shaderAzslArguments), "" /* Don't care about DXC in this test */);
+        globalBuildOptions.m_compilerArguments.Merge(shaderCompilerArguments);
+
+        // Let's create the dummy supervariant. It will have some MCPP & AZSLc arguments to be added/replaced AND other MCPP & AZSLc arguments to be removed.
+        AZStd::vector<KeyValueView> supervariantAzslArgumentsToAdd = {
+            {AZSLC_ARG2, AZSLC_NEW_VAL2b},
+            {AZSLC_ARG7, ""},
+        };
+        AZStd::vector<KeyValueView> supervariantMacroDefinitionsToAdd = {
+            {MCPP_MACRO1, MCPP_NEW_VALUE1},
+            {MCPP_MACRO3, MCPP_NEW_VALUE3},
+            {MCPP_MACRO5, ""},
+        };
+        auto supervariantArgumentsToAdd = CreateCmdLineStringFromListOfKeyValues(supervariantAzslArgumentsToAdd) +
+            CreateMacroDefinitionCmdLineStringFromListOfKeyValues(supervariantMacroDefinitionsToAdd);
+
+        AZStd::vector<KeyValueView> supervariantAzslArgumentsToRemove = {
+            {AZSLC_ARG4, ""},
+            {AZSLC_ARG1, ""},
+        };
+        AZStd::vector<KeyValueView> supervariantMacrosToRemove = { 
+            {MCPP_MACRO2, ""},
+            {MCPP_MACRO4, ""},
+        };
+        auto supervariantArgumentsToRemove = CreateCmdLineStringFromListOfKeyValues(supervariantAzslArgumentsToRemove) +
+            CreateMacroDefinitionCmdLineStringFromListOfKeyValues(supervariantMacrosToRemove);
+
+        //CreateMacroDefinitionCmdLineStringFromListOfKeyValues
+        auto supervariantInfo = CreateSupervariantInfo("Dummy",
+            supervariantArgumentsToAdd, // These arguments will be added or replace existing ones.
+            supervariantArgumentsToRemove); // These arguments must be removed.
+
+        AZStd::vector<AZStd::string> macroDefinitionNamesToRemove = supervariantInfo.GetCombinedListOfMacroDefinitionNamesToRemove();
+        globalBuildOptions.m_preprocessorSettings.RemovePredefinedMacros(macroDefinitionNamesToRemove);
+        AZStd::vector<AZStd::string> macroDefinitionsToAdd = supervariantInfo.GetMacroDefinitionsToAdd();
+        globalBuildOptions.m_preprocessorSettings.m_predefinedMacros.insert(
+            globalBuildOptions.m_preprocessorSettings.m_predefinedMacros.end(), macroDefinitionsToAdd.begin(), macroDefinitionsToAdd.end());
+
+        // Validate macro definitions that must be present.
+        EXPECT_TRUE(
+            VectorContainsAllSubstrings(
+                globalBuildOptions.m_preprocessorSettings.m_predefinedMacros,
+                AZStd::vector<AZStd::string>({MCPP_MACRO1, MCPP_NEW_VALUE1, MCPP_MACRO3, MCPP_NEW_VALUE3, MCPP_MACRO5}))
+        );
+
+        // Validate macro definitions that can't be present.
+        EXPECT_TRUE(
+            VectorDoesNotContainAnyOneOfTheSubstrings(
+                globalBuildOptions.m_preprocessorSettings.m_predefinedMacros,
+                AZStd::vector<AZStd::string>({MCPP_MACRO2, MCPP_VALUE3, MCPP_MACRO4}))
+        );
+
+        AZStd::string azslcArgsFromGlobalBuildOptions = globalBuildOptions.m_compilerArguments.MakeAdditionalAzslcCommandLineString();
+
+        // The result of GetCustomizedArgumentsForAzslc() is the most important value to test
+        AZStd::string customizedAzslcArgs = supervariantInfo.GetCustomizedArgumentsForAzslc(azslcArgsFromGlobalBuildOptions);
+
+        EXPECT_TRUE(
+            StringContainsAllSubstrings(customizedAzslcArgs, CreateListOfSingleStringsFromListOfKeyValues(supervariantAzslArgumentsToAdd))
+        );
+
+        EXPECT_TRUE(
+            StringDoesNotContainAnyOneOfTheSubstrings(customizedAzslcArgs, CreateListOfSingleStringsFromListOfKeyValues(supervariantAzslArgumentsToRemove))
+        );
+
+        EXPECT_TRUE(
+            StringContainsAllSubstrings(customizedAzslcArgs, AZStd::vector<AZStd::string>({AZSLC_ARG3, AZSLC_VAL3, AZSLC_ARG5, AZSLC_VAL5}))
+        );
+    }
+
+
+} //namespace UnitTest
+
+AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
+
diff --git a/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake
new file mode 100644
index 0000000000..9f22f9f632
--- /dev/null
+++ b/Gems/Atom/Asset/Shader/Code/atom_asset_shader_builders_tests_files.cmake
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    Tests/Common/ShaderBuilderTestFixture.h
+    Tests/Common/ShaderBuilderTestFixture.cpp
+    Tests/SupervariantCmdArgumentTests.cpp
+)
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
index 954e01c592..4d13663aae 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR.materialtype
@@ -1,5 +1,5 @@
 {
-    "description": "Material Type with properties used to define Enhanced PBR material shading model.",
+    "description": "Material Type with properties used to define Enhanced PBR, a metallic-roughness Physically-Based Rendering (PBR) material shading model, with advanced features like subsurface scattering, transmission, and anisotropy.",
     "propertyLayout": {
         "version": 3,
         "groups": [
@@ -32,7 +32,7 @@
                 "id": "clearCoat",
                 "displayName": "Clear Coat",
                 "description": "Properties for configuring gloss clear coat"
-            },
+            }, 
             {
                 "id": "normal",
                 "displayName": "Normal",
@@ -205,6 +205,13 @@
                         "id": "m_baseColorMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -228,13 +235,6 @@
                         "type": "ShaderOption",
                         "id": "o_baseColorTextureBlendMode"
                     }
-                },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map.",
-                    "type": "Bool",
-                    "defaultValue": true
                 }
             ],
             "metallic": [
@@ -261,6 +261,13 @@
                         "id": "m_metallicMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map, or just default to the Factor value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -272,29 +279,9 @@
                         "type": "ShaderInput",
                         "id": "m_metallicMapUvIndex"
                     }
-                },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
                 }
             ],
             "roughness": [
-                {
-                    "id": "factor",
-                    "displayName": "Factor",
-                    "description": "Strength factor for scaling the values",
-                    "type": "Float",
-                    "defaultValue": 1.0,
-                    "min": 0.0,
-                    "max": 1.0,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_roughnessFactor"
-                    }
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
@@ -305,6 +292,13 @@
                         "id": "m_roughnessMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map, or just default to the Factor value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -346,11 +340,18 @@
                     }
                 },
                 {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
+                    // Note that "factor" is mutually exclusive with "lowerBound"/"upperBound". These are swapped by a lua functor.
+                    "id": "factor",
+                    "displayName": "Factor",
+                    "description": "Controls the roughness value",
+                    "type": "Float",
+                    "defaultValue": 1.0,
+                    "min": 0.0,
+                    "max": 1.0,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_roughnessFactor"
+                    }
                 }
             ],
             "anisotropy": [
@@ -416,6 +417,13 @@
                         "id": "m_specularF0Map"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map, or just default to the Factor value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -428,13 +436,7 @@
                         "id": "m_specularF0MapUvIndex"
                     }
                 },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
+                // Consider moving this to the "general" group to be consistent with StandardMultilayerPBR
                 {
                     "id": "enableMultiScatterCompensation",
                     "displayName": "Multiscattering Compensation",
@@ -452,11 +454,7 @@
                     "displayName": "Enable",
                     "description": "Enable clear coat",
                     "type": "Bool",
-                    "defaultValue": false,
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_clearCoat_feature_enabled"
-                    }
+                    "defaultValue": false
                 },
                 {
                     "id": "factor",
@@ -481,6 +479,13 @@
                         "id": "m_clearCoatInfluenceMap"
                     }
                 },
+                {
+                    "id": "useInfluenceMap",
+                    "displayName": "    Use Texture",
+                    "description": "Whether to use the texture map, or just default to the Factor value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "influenceMapUv",
                     "displayName": "    UV",
@@ -493,13 +498,6 @@
                         "id": "m_clearCoatInfluenceMapUvIndex"
                     }
                 },
-                {
-                    "id": "useInfluenceMap",
-                    "displayName": "    Use Texture",
-                    "description": "Whether to use the texture map, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
                 {
                     "id": "roughness",
                     "displayName": "Roughness",
@@ -523,6 +521,13 @@
                         "id": "m_clearCoatRoughnessMap"
                     }
                 },
+                {
+                    "id": "useRoughnessMap",
+                    "displayName": "    Use Texture",
+                    "description": "Whether to use the texture map, or just default to the roughness value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "roughnessMapUv",
                     "displayName": "    UV",
@@ -535,13 +540,6 @@
                         "id": "m_clearCoatRoughnessMapUvIndex"
                     }
                 },
-                {
-                    "id": "useRoughnessMap",
-                    "displayName": "    Use Texture",
-                    "description": "Whether to use the texture map, or just default to the roughness value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
                 {
                     "id": "normalStrength",
                     "displayName": "Normal Strength",
@@ -565,9 +563,16 @@
                         "id": "m_clearCoatNormalMap"
                     }
                 },
+                {
+                    "id": "useNormalMap",
+                    "displayName": "    Use Texture",
+                    "description": "Whether to use the normal map",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "normalMapUv",
-                    "displayName": "UV",
+                    "displayName": "    UV",
                     "description": "Normal texture map UV set",
                     "type": "Enum",
                     "enumIsUv": true,
@@ -576,29 +581,9 @@
                         "type": "ShaderInput",
                         "id": "m_clearCoatNormalMapUvIndex"
                     }
-                },
-                {
-                    "id": "useNormalMap",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the normal map",
-                    "type": "Bool",
-                    "defaultValue": true
                 }
             ],
             "normal": [
-                {
-                    "id": "factor",
-                    "displayName": "Factor",
-                    "description": "Strength factor for scaling the values",
-                    "type": "Float",
-                    "defaultValue": 1.0,
-                    "min": 0.0,
-                    "softMax": 2.0,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_normalFactor"
-                    }
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
@@ -609,6 +594,13 @@
                         "id": "m_normalMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map, or just rely on vertex normals.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -621,13 +613,6 @@
                         "id": "m_normalMapUvIndex"
                     }
                 },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map, or just rely on vertex normals.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
                 {
                     "id": "flipX",
                     "displayName": "Flip X Channel",
@@ -649,6 +634,19 @@
                         "type": "ShaderInput",
                         "id": "m_flipNormalY"
                     }
+                },
+                {
+                    "id": "factor",
+                    "displayName": "Factor",
+                    "description": "Strength factor for scaling the values",
+                    "type": "Float",
+                    "defaultValue": 1.0,
+                    "min": 0.0,
+                    "softMax": 2.0,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_normalFactor"
+                    }
                 }
             ],
             "opacity": [
@@ -725,7 +723,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -872,18 +870,14 @@
                     "displayName": "Enable",
                     "description": "Enable the emissive group",
                     "type": "Bool",
-                    "defaultValue": false,
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_emissiveEnabled"
-                    }
+                    "defaultValue": false
                 },
                 {
                     "id": "unit",
                     "displayName": "Units",
                     "description": "The photometric units of the Intensity property.",
                     "type": "Enum",
-                    "enumValues": [ "Ev100" ],
+                    "enumValues": ["Ev100"],
                     "defaultValue": "Ev100"
                 },
                 {
@@ -918,34 +912,27 @@
                         "id": "m_emissiveMap"
                     }
                 },
-                {
-                    "id": "textureMapUv",
-                    "displayName": "UV",
-                    "description": "Emissive texture map UV set",
-                    "type": "Enum",
-                    "enumValues": [ "UV0", "UV1" ],
-                    "defaultValue": "UV0",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_emissiveMapUvIndex"
-                    }
-                },
                 {
                     "id": "useTexture",
                     "displayName": "Use Texture",
                     "description": "Whether to use the texture map.",
                     "type": "Bool",
                     "defaultValue": true
+                },
+                {
+                    "id": "textureMapUv",
+                    "displayName": "UV",
+                    "description": "Emissive texture map UV set",
+                    "type": "Enum",
+                    "enumIsUv": true,
+                    "defaultValue": "Tiled",
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_emissiveMapUvIndex"
+                    }
                 }
             ],
             "parallax": [
-                {
-                    "id": "enable",
-                    "displayName": "Enable",
-                    "description": "Whether to enable the parallax feature.",
-                    "type": "Bool",
-                    "defaultValue": false
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
@@ -956,13 +943,20 @@
                         "id": "m_depthMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
                     "description": "Depth texture map UV set",
                     "type": "Enum",
-                    "enumValues": [ "UV0", "UV1" ],
-                    "defaultValue": "UV0",
+                    "enumIsUv": true,
+                    "defaultValue": "Tiled",
                     "connection": {
                         "type": "ShaderInput",
                         "id": "m_parallaxUvIndex"
@@ -973,7 +967,7 @@
                     "displayName": "Heightmap Scale",
                     "description": "The total height of the heightmap in local model units.",
                     "type": "Float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 0.05,
                     "min": 0.0,
                     "softMax": 0.1,
                     "connection": {
@@ -1011,7 +1005,7 @@
                     "description": "Select the algorithm to use for parallax mapping.",
                     "type": "Enum",
                     "enumValues": [ "Basic", "Steep", "POM", "Relief", "ContactRefinement" ],
-                    "defaultValue": "Basic",
+                    "defaultValue": "POM",
                     "connection": {
                         "type": "ShaderOption",
                         "id": "o_parallax_algorithm"
@@ -1055,7 +1049,7 @@
             "subsurfaceScattering": [
                 {
                     "id": "enableSubsurfaceScattering",
-                    "displayName": "Enable Subsurface Scattering",
+                    "displayName": "Subsurface Scattering",
                     "description": "Enable subsurface scattering feature, this will disable metallic and parallax mapping property due to incompatibility",
                     "type": "Bool",
                     "defaultValue": false,
@@ -1069,7 +1063,7 @@
                     "displayName": "    Factor",
                     "description": "Strength factor for scaling percentage of subsurface scattering effect applied",
                     "type": "float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 1.0,
                     "min": 0.0,
                     "max": 1.0,
                     "connection": {
@@ -1087,18 +1081,6 @@
                         "id": "m_subsurfaceScatteringInfluenceMap"
                     }
                 },
-                {
-                    "id": "influenceMapUv",
-                    "displayName": "    UV",
-                    "description": "Influence map UV set",
-                    "type": "Enum",
-                    "enumValues": [ "UV0", "UV1" ],
-                    "defaultValue": "UV0",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_subsurfaceScatteringInfluenceMapUvIndex"
-                    }
-                },
                 {
                     "id": "useInfluenceMap",
                     "displayName": "    Use Influence Map",
@@ -1106,6 +1088,18 @@
                     "type": "Bool",
                     "defaultValue": true
                 },
+                {
+                    "id": "influenceMapUv",
+                    "displayName": "    UV",
+                    "description": "Influence map UV set",
+                    "type": "Enum",
+                    "enumIsUv": true,
+                    "defaultValue": "Tiled",
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_subsurfaceScatteringInfluenceMapUvIndex"
+                    }
+                },
                 {
                     "id": "scatterColor",
                     "displayName": "    Scatter color",
@@ -1136,11 +1130,16 @@
                     }
                 },
                 {
-                    "id": "enableTransmission",
-                    "displayName": "Enable Transmission",
-                    "description": "Enable transmission feature",
-                    "type": "Bool",
-                    "defaultValue": false
+                    "id": "transmissionMode",
+                    "displayName": "Transmission",
+                    "description": "Algorithm used for calculating transmission",
+                    "type": "Enum",
+                    "enumValues": [ "None", "ThickObject", "ThinObject" ],
+                    "defaultValue": "None",
+                    "connection": {
+                        "type": "ShaderOption",
+                        "id": "o_transmission_mode"
+                    }
                 },
                 {
                     "id": "thickness",
@@ -1161,18 +1160,6 @@
                         "id": "m_transmissionThicknessMap"
                     }
                 },
-                {
-                    "id": "thicknessMapUv",
-                    "displayName": "    UV",
-                    "description": "Thickness map UV set",
-                    "type": "Enum",
-                    "enumValues": [ "UV0", "UV1" ],
-                    "defaultValue": "UV0",
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_transmissionThicknessMapUvIndex"
-                    }
-                },
                 {
                     "id": "useThicknessMap",
                     "displayName": "    Use Thickness Map",
@@ -1180,6 +1167,18 @@
                     "type": "Bool",
                     "defaultValue": true
                 },
+                {
+                    "id": "thicknessMapUv",
+                    "displayName": "    UV",
+                    "description": "Thickness map UV set",
+                    "type": "Enum",
+                    "enumIsUv": true,
+                    "defaultValue": "Tiled",
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_transmissionThicknessMapUvIndex"
+                    }
+                },
                 {
                     "id": "transmissionTint",
                     "displayName": "    Transmission Tint",
@@ -1187,18 +1186,6 @@
                     "type": "Color",
                     "defaultValue": [ 1.0, 0.8, 0.6 ]
                 },
-                {
-                    "id": "transmissionMode",
-                    "displayName": "    Mode",
-                    "description": "Algorithm used for calculating transmission",
-                    "type": "Enum",
-                    "enumValues": [ "None", "ThickObject", "ThinObject" ],
-                    "defaultValue": "None",
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_transmission_mode"
-                    }
-                },
                 {
                     "id": "transmissionPower",
                     "displayName": "    Power",
@@ -1287,7 +1274,7 @@
                     }
                 },
                 {
-                    "id": "detailMapsMapUv",
+                    "id": "textureMapUv",
                     "displayName": "Detail Map UVs",
                     "description": "Which UV set to use for detail map texture sampling",
                     "type": "Enum",
@@ -1388,7 +1375,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -1506,7 +1493,7 @@
         {
             "file": "Shaders/Depth/DepthPassTransparentMax.shader",
             "tag": "DepthPassTransparentMax"
-        }
+        }        
     ],
     "functors": [
         {
@@ -1549,26 +1536,9 @@
                 "lightUnitProperty": "emissive.unit",
                 "shaderInput": "m_emissiveIntensity",
                 "ev100Index": 0,
-                "nitIndex": 1,
-                "ev100MinMax": [ -10, 20 ],
-                "nitMinMax": [ 0.001, 100000.0 ]
-            }
-        },
-        {
-            // Enable/Disable shader based on different option.
-            "type": "ShaderEnable",
-            "args": {
-                "opacityMode": "opacity.mode",
-                "parallaxEnable": "parallax.enable",
-                "parallaxPdoEnable": "parallax.pdo",
-                "pbrShaderNoEdsIndex": 0,
-                "pbrShaderWithEdsIndex": 1,
-                "shadowShaderNoPSIndex": 2,
-                "shadowShaderWithPSIndex": 3,
-                "depthShaderNoPSIndex": 4,
-                "depthShaderWithPSIndex": 5,
-                "depthShaderTransparentMin": 8,
-                "depthShaderTransparentMax": 9
+                "nitIndex" : 1,
+                "ev100MinMax": [-10, 20],
+                "nitMinMax": [0.001, 100000.0]
             }
         },
         {
@@ -1590,120 +1560,40 @@
                 "tintThickenssShaderInput": "m_transmissionTintThickness"
             }
         },
-        { 
-            // Reads material properties to determine whether a specific texture map should be sampled at runtime, and sets a shader option accordingly.
-            // @param textureProperty    - which material property contains the texture asset reference (or maybe null)
-            // @param useTextureProperty - a boolean flag that toggles whether the texture should be sampled (if it's not null)
-            // @param shaderTags         - which shader in the 'shaders' list above is configured by this functor
-            // @param shaderOption       - the name of a shader option in the AZSL file that controls sampling of this texture
+        {
             "type": "UseTexture",
             "args": {
                 "textureProperty": "baseColor.textureMap",
-                "dependentProperties": ["baseColor.textureMapUv"],
                 "useTextureProperty": "baseColor.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
+                "dependentProperties": ["baseColor.textureMapUv", "baseColor.textureBlendMode"],
                 "shaderOption": "o_baseColor_useTexture"
             }
         },
         {
-            // See the comment above for details.
             "type": "UseTexture",
             "args": {
                 "textureProperty": "metallic.textureMap",
-                "dependentProperties": ["metallic.textureMapUv"],
                 "useTextureProperty": "metallic.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
+                "dependentProperties": ["metallic.textureMapUv"],
                 "shaderOption": "o_metallic_useTexture"
             }
         },
         {
-            // See the comment above for details.
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "roughness.textureMap",
-                "dependentProperties": ["roughness.textureMapUv"],
-                "useTextureProperty": "roughness.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_roughness_useTexture"
-            }
-        },
-        {
-            // See the comment above for details.
             "type": "UseTexture",
             "args": {
                 "textureProperty": "specularF0.textureMap",
-                "dependentProperties": ["specularF0.textureMapUv"],
                 "useTextureProperty": "specularF0.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
+                "dependentProperties": ["specularF0.textureMapUv"],
                 "shaderOption": "o_specularF0_useTexture"
             }
         },
         {
-            // See the comment above for details.
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "clearCoat.influenceMap",
-                "dependentProperties": ["clearCoat.influenceMapUv"],
-                "useTextureProperty": "clearCoat.useInfluenceMap",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_clearCoat_factor_useTexture"
-            }
-        },
-        {
-            // See the comment above for details.
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "clearCoat.roughnessMap",
-                "dependentProperties": ["clearCoat.roughnessMapUv"],
-                "useTextureProperty": "clearCoat.useRoughnessMap",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_clearCoat_roughness_useTexture"
-            }
-        },
-        {
-            // See the comment above for details.
-            "type": "UseTexture",
-            "args": {
-                "textureProperty": "clearCoat.normalMap",
-                "dependentProperties": ["clearCoat.normalMapUv"],
-                "useTextureProperty": "clearCoat.useNormalMap",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_clearCoat_normal_useTexture"
-            }
-        },
-        {
-            // See the comment above for details.
             "type": "UseTexture",
             "args": {
                 "textureProperty": "normal.textureMap",
-                "dependentProperties": ["normal.textureMapUv"],
                 "useTextureProperty": "normal.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_normal_useTexture"
+                "dependentProperties": ["normal.textureMapUv", "normal.factor", "normal.flipX", "normal.flipY"],
+                "shaderOption": "o_normal_useTexture"    
             }
         },
         {
@@ -1725,335 +1615,21 @@
             }
         },
         {
-            // See the comment above for details.
-            "type": "UseTexture",
+            "type": "Lua",
             "args": {
-                "textureProperty": "emissive.textureMap",
-                "dependentProperties": ["emissive.textureMapUv"],
-                "useTextureProperty": "emissive.useTexture",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_emissive_useTexture"
+                "file": "StandardPBR_ClearCoatState.lua"
             }
         },
         {
-            // See the comment above for details.
-            "type": "UseTexture",
+            "type": "Lua",
             "args": {
-                "textureProperty": "subsurfaceScattering.influenceMap",
-                "dependentProperties": ["subsurfaceScattering.influenceMapUv"],
-                "useTextureProperty": "subsurfaceScattering.useInfluenceMap",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_subsurfaceScattering_useTexture"
+                "file": "StandardPBR_ClearCoatEnableFeature.lua"
             }
         },
         {
-            // See the comment above for details.
-            "type": "UseTexture",
+            "type": "Lua",
             "args": {
-                "textureProperty": "subsurfaceScattering.thicknessMap",
-                "dependentProperties": ["subsurfaceScattering.thicknessMapUv"],
-                "useTextureProperty": "subsurfaceScattering.useThicknessMap",
-                "shaderTags": [ 
-                    "ForwardPass",
-                    "ForwardPass_EDS"
-                ],
-                "shaderOption": "o_transmission_useTexture"
-            }
-        },
-        {
-            // Controls visibility for properties in the editor.
-            // @param actions            - a list of actions that are executed in order. visibility will be set when triggerProperty hits the triggerValue.
-            // @param affectedProperties - the properties that are affected by actions.
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "emissive.enable",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "emissive.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "emissive.color",
-                    "emissive.intensity",
-                    "emissive.useTexture",
-                    "emissive.unit"
-                ]
-            }
-        },
-        {
-            // Controls visibility for properties in the editor.
-            // @param actions            - a list of actions that are executed in order. visibility will be set when triggerProperty hits the triggerValue.
-            // @param affectedProperties - the properties that are affected by actions.
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "emissive.useTexture",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "emissive.useTexture",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "emissive.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "emissive.textureMap",
-                    "emissive.textureMapUv"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "clearCoat.useInfluenceMap",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.useInfluenceMap",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "clearCoat.influenceMap",
-                    "clearCoat.influenceMapUv"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "clearCoat.useRoughnessMap",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.useRoughnessMap",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "clearCoat.roughnessMap",
-                    "clearCoat.roughnessMapUv"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "clearCoat.useNormalMap",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.useNormalMap",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "clearCoat.normalMap",
-                    "clearCoat.normalMapUv"
-                ]
-            }
-
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "subsurfaceScattering.useInfluenceMap",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.useInfluenceMap",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableSubsurfaceScattering",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "subsurfaceScattering.influenceMap",
-                    "subsurfaceScattering.influenceMapUv"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "subsurfaceScattering.useThicknessMap",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.useThicknessMap",
-                        "triggerValue": false,
-                        "visibility": "Disabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableTransmission",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "subsurfaceScattering.thicknessMap",
-                    "subsurfaceScattering.thicknessMapUv"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "clearCoat.enable",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "clearCoat.enable",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "clearCoat.factor",
-                    "clearCoat.useInfluenceMap",
-                    "clearCoat.roughness",
-                    "clearCoat.useRoughnessMap",
-                    "clearCoat.useNormalMap"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "subsurfaceScattering.transmissionMode",
-                        "triggerValue": "ThickObject",
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.transmissionMode",
-                        "triggerValue": "None",
-                        "visibility": "Hidden"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.transmissionMode",
-                        "triggerValue": "ThinObject",
-                        "visibility": "Hidden"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableTransmission",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "subsurfaceScattering.transmissionPower",
-                    "subsurfaceScattering.transmissionDistortion",
-                    "subsurfaceScattering.transmissionAttenuation"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableSubsurfaceScattering",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableSubsurfaceScattering",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "subsurfaceScattering.subsurfaceScatterFactor",
-                    "subsurfaceScattering.useInfluenceMap",
-                    "subsurfaceScattering.scatterColor",
-                    "subsurfaceScattering.scatterDistance",
-                    "subsurfaceScattering.quality"
-                ]
-            }
-        },
-        {
-            "type": "UpdatePropertyVisibility",
-            "args": {
-                "actions": [
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableTransmission",
-                        "triggerValue": true,
-                        "visibility": "Enabled"
-                    },
-                    {
-                        "triggerProperty": "subsurfaceScattering.enableTransmission",
-                        "triggerValue": false,
-                        "visibility": "Hidden"
-                    }
-                ],
-                "affectedProperties": [
-                    "subsurfaceScattering.thickness",
-                    "subsurfaceScattering.useThicknessMap",
-                    "subsurfaceScattering.transmissionTint",
-                    "subsurfaceScattering.transmissionMode",
-                    "subsurfaceScattering.transmissionScale"
-                ]
+                "file": "StandardPBR_EmissiveState.lua"
             }
         },
         {
@@ -2062,30 +1638,24 @@
                 "file": "StandardPBR_ParallaxState.lua"
             }
         },
+        {
+            "type": "Lua",
+            "args": {
+                "file": "StandardPBR_Roughness.lua"
+            }
+        },
+        {
+            "type": "Lua",
+            "args": {
+                "file": "StandardPBR_SubsurfaceState.lua"
+            }
+        },
         {
             "type": "Lua",
             "args": {
                 "file": "StandardPBR_HandleOpacityDoubleSided.lua"
             }
         },
-        {
-            "type": "OverrideDrawList",
-            "args": {
-                "triggerProperty": "opacity.mode",
-                "triggerValue": "Blended",
-                "shaderIndex": 1,
-                "drawList": "transparent"
-            }
-        },
-        {
-            "type": "OverrideDrawList",
-            "args": {
-                "triggerProperty": "opacity.mode",
-                "triggerValue": "TintedTransparent",
-                "shaderIndex": 1,
-                "drawList": "transparent"
-            }
-        },
         {
             "type": "Lua",
             "args": {
@@ -2097,6 +1667,12 @@
             "args": {
                 "file": "MaterialInputs/DetailMapsCommonFunctor.lua"
             }
+        },
+        {
+            "type": "Lua",
+            "args": {
+                "file": "StandardPBR_ShaderEnable.lua"
+            }
         }
     ],
     "uvNameMap": {
@@ -2104,3 +1680,4 @@
         "UV1": "Unwrapped"
     }
 }
+
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
index db99ee7e24..644473fef9 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_DepthPass_WithPS.azsl
@@ -77,10 +77,9 @@ PSDepthOutput MainPS(VSDepthOutput IN, bool isFrontFace : SV_IsFrontFace)
     
     if(ShouldHandleParallaxInDepthShaders())
     {
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
 
         float3x3 uvMatrix = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3();
         float3x3 uvMatrixInverse = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrixInverse : CreateIdentity3x3();
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
index a91e88afad..a4fcccb5f5 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_ForwardPass.azsl
@@ -117,19 +117,12 @@ VSOutput EnhancedPbr_ForwardPassVS(VSInput IN)
 PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float depth)
 {
     // ------- Tangents & Bitangets -------
+    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
 
-    // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-
-    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering && MaterialSrg::m_parallaxUvIndex != 0)
-        || (o_normal_useTexture && MaterialSrg::m_normalMapUvIndex != 0)
-        || (o_clearCoat_enabled && o_clearCoat_normal_useTexture && MaterialSrg::m_clearCoatNormalMapUvIndex != 0)
-        || (o_detail_normal_useTexture && MaterialSrg::m_detail_allMapsUvIndex != 0))
+    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering) || o_normal_useTexture || (o_clearCoat_enabled && o_clearCoat_normal_useTexture) || o_detail_normal_useTexture)
     {
-        // Generate the tangent/bitangent for UV[1+]
-        const int startIndex = 1;
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, startIndex);
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
     }
 
     // ------- Depth & Parallax -------
@@ -260,7 +253,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         // Convert the angle from [0..1] = [0 .. 180 degrees] to radians [0 .. PI]
         const float anisotropyAngle = MaterialSrg::m_anisotropicAngle * PI;
         const float anisotropyFactor = MaterialSrg::m_anisotropicFactor;
-        surface.anisotropy.Init(surface.normal, tangents[0], bitangents[0], anisotropyAngle, anisotropyFactor, surface.roughnessA);
+        surface.anisotropy.Init(surface.normal, IN.m_tangent, IN.m_bitangent, anisotropyAngle, anisotropyFactor, surface.roughnessA);
     }
 
     // ------- Lighting Data -------
@@ -274,16 +267,16 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     // Directional light shadow coordinates
     lightingData.shadowCoords = IN.m_shadowCoords;
 
-    // ------- Occlusion -------
-    
-    lightingData.diffuseAmbientOcclusion = GetOcclusionInput(MaterialSrg::m_diffuseOcclusionMap, MaterialSrg::m_sampler, IN.m_uv[MaterialSrg::m_diffuseOcclusionMapUvIndex], MaterialSrg::m_diffuseOcclusionFactor, o_diffuseOcclusion_useTexture);
-    lightingData.specularOcclusion = GetOcclusionInput(MaterialSrg::m_specularOcclusionMap, MaterialSrg::m_sampler, IN.m_uv[MaterialSrg::m_specularOcclusionMapUvIndex], MaterialSrg::m_specularOcclusionFactor, o_specularOcclusion_useTexture);
-
     // ------- Emissive -------
 
     float2 emissiveUv = IN.m_uv[MaterialSrg::m_emissiveMapUvIndex];
     lightingData.emissiveLighting = GetEmissiveInput(MaterialSrg::m_emissiveMap, MaterialSrg::m_sampler, emissiveUv, MaterialSrg::m_emissiveIntensity, MaterialSrg::m_emissiveColor.rgb, o_emissiveEnabled, o_emissive_useTexture);
 
+    // ------- Occlusion -------
+    
+    lightingData.diffuseAmbientOcclusion = GetOcclusionInput(MaterialSrg::m_diffuseOcclusionMap, MaterialSrg::m_sampler, IN.m_uv[MaterialSrg::m_diffuseOcclusionMapUvIndex], MaterialSrg::m_diffuseOcclusionFactor, o_diffuseOcclusion_useTexture);
+    lightingData.specularOcclusion = GetOcclusionInput(MaterialSrg::m_specularOcclusionMap, MaterialSrg::m_sampler, IN.m_uv[MaterialSrg::m_specularOcclusionMapUvIndex], MaterialSrg::m_specularOcclusionFactor, o_specularOcclusion_useTexture);
+
     // ------- Clearcoat -------
     
     // [GFX TODO][ATOM-14603]: Clean up the double uses of these clear coat flags
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
index 80aedcd6f4..7f6be252e2 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/EnhancedPBR_Shadowmap_WithPS.azsl
@@ -80,10 +80,10 @@ PSDepthOutput MainPS(VertexOutput IN, bool isFrontFace : SV_IsFrontFace)
     {
         static const float ShadowMapDepthBias = 0.000001;
 
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
 
         float3x3 uvMatrix = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3();
         float3x3 uvMatrixInverse = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrixInverse : CreateIdentity3x3();
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
index 456d7cbabe..4fe1f2b364 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.azsl
@@ -180,17 +180,12 @@ PbrLightingOutput SkinPS_Common(VSOutput IN)
     float3x3 uvMatrix = CreateIdentity3x3();
 
     // ------- Tangents & Bitangets -------
+    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
 
-    // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-
-    if ( (o_normal_useTexture && MaterialSrg::m_normalMapUvIndex != 0) || 
-         (o_detail_normal_useTexture && MaterialSrg::m_detail_allMapsUvIndex != 0))
+    if (o_normal_useTexture || o_detail_normal_useTexture)
     {
-        // Generate the tangent/bitangent for UV[1+]
-        const int startIndex = 1;
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, startIndex);
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
     }
     
     Surface surface;
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
index 101a03b907..f8c49d579c 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/Skin.materialtype
@@ -287,6 +287,13 @@
                         "id": "m_specularF0Map"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map, or just default to the Factor value.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -299,13 +306,7 @@
                         "id": "m_specularF0MapUvIndex"
                     }
                 },
-                {
-                    "id": "useTexture",
-                    "displayName": "Use Texture",
-                    "description": "Whether to use the texture map, or just default to the Factor value.",
-                    "type": "Bool",
-                    "defaultValue": true
-                },
+                // Consider moving this to the "general" group to be consistent with StandardMultilayerPBR
                 {
                     "id": "enableMultiScatterCompensation",
                     "displayName": "Multiscattering Compensation",
@@ -616,7 +617,7 @@
                     "type": "float",
                     "defaultValue": 6.0,
                     "min": 0.0,
-                    "softMax":  20.0
+                    "softMax": 20.0
                 },
                 {
                     "id": "transmissionDistortion",
@@ -909,7 +910,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -1011,18 +1012,18 @@
             "type": "HandleSubsurfaceScatteringParameters",
             "args": {
                 "mode": "subsurfaceScattering.transmissionMode",
-                "scale" : "subsurfaceScattering.transmissionScale",
-                "power" : "subsurfaceScattering.transmissionPower",
-                "distortion" : "subsurfaceScattering.transmissionDistortion",
-                "attenuation" : "subsurfaceScattering.transmissionAttenuation",
-                "tintColor" : "subsurfaceScattering.transmissionTint",
-                "thickness" : "subsurfaceScattering.thickness",
+                "scale": "subsurfaceScattering.transmissionScale",
+                "power": "subsurfaceScattering.transmissionPower",
+                "distortion": "subsurfaceScattering.transmissionDistortion",
+                "attenuation": "subsurfaceScattering.transmissionAttenuation",
+                "tintColor": "subsurfaceScattering.transmissionTint",
+                "thickness": "subsurfaceScattering.thickness",
                 "enabled": "subsurfaceScattering.enableSubsurfaceScattering",
-                "scatterDistanceColor" : "subsurfaceScattering.scatterColor",
-                "scatterDistanceIntensity" : "subsurfaceScattering.scatterDistance",
-                "scatterDistanceShaderInput" : "m_scatterDistance",
-                "parametersShaderInput" : "m_transmissionParams",
-                "tintThickenssShaderInput" : "m_transmissionTintThickness"
+                "scatterDistanceColor": "subsurfaceScattering.scatterColor",
+                "scatterDistanceIntensity": "subsurfaceScattering.scatterDistance",
+                "scatterDistanceShaderInput": "m_scatterDistance",
+                "parametersShaderInput": "m_transmissionParams",
+                "tintThickenssShaderInput": "m_transmissionTintThickness"
             }
         },
         {
@@ -1038,8 +1039,8 @@
             "type": "UseTexture",
             "args": {
                 "textureProperty": "specularF0.textureMap",
-                "dependentProperties": ["specularF0.textureMapUv"],
                 "useTextureProperty": "specularF0.useTexture",
+                "dependentProperties": ["specularF0.textureMapUv"],
                 "shaderOption": "o_specularF0_useTexture"
             }
         },
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
index a2854e8902..ec1298ae77 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR.materialtype
@@ -3,11 +3,6 @@
     "propertyLayout": {
         "version": 3,
         "groups": [
-            {
-                "id": "general",
-                "displayName": "General",
-                "description": "General settings."
-            },
             {
                 "id": "blend",
                 "displayName": "Blend Settings",
@@ -29,6 +24,11 @@
                 "displayName": "Irradiance",
                 "description": "Properties for configuring the irradiance used in global illumination."
             },
+            {
+                "id": "general",
+                "displayName": "General",
+                "description": "General settings."
+            },
             //##############################################################################################
             // Layer 1 Groups 
             //##############################################################################################
@@ -74,8 +74,8 @@
             },
             {
                 "id": "layer1_parallax",
-                "displayName": "Layer 1: Parallax Mapping",
-                "description": "Properties for parallax effect produced by depthmap."
+                "displayName": "Layer 1: Displacement",
+                "description": "Properties for surface displacement, which can be used for displacement-based blending and/or a parallax effect."
             },
             {
                 "id": "layer1_uv",
@@ -127,8 +127,8 @@
             },
             {
                 "id": "layer2_parallax",
-                "displayName": "Layer 2: Parallax Mapping",
-                "description": "Properties for parallax effect produced by depthmap."
+                "displayName": "Layer 2: Displacement",
+                "description": "Properties for surface displacement, which can be used for displacement-based blending and/or a parallax effect."
             },
             {
                 "id": "layer2_uv",
@@ -180,8 +180,8 @@
             },
             {
                 "id": "layer3_parallax",
-                "displayName": "Layer 3: Parallax Mapping",
-                "description": "Properties for parallax effect produced by depthmap."
+                "displayName": "Layer 3: Displacement",
+                "description": "Properties for surface displacement, which can be used for displacement-based blending and/or a parallax effect."
             },
             {
                 "id": "layer3_uv",
@@ -194,18 +194,6 @@
             // General Properties 
             //##############################################################################################
             "general": [
-                {
-                    "id": "debugDrawMode",
-                    "displayName": "Debug Draw Mode",
-                    "description": "Enables various debug view features.",
-                    "type": "Enum",
-                    "enumValues": [ "None", "BlendSource", "DepthMaps" ],
-                    "defaultValue": "None",
-                    "connection": {
-                        "type": "ShaderOption",
-                        "id": "o_debugDrawMode"
-                    }
-                },
                 {
                     "id": "applySpecularAA",
                     "displayName": "Apply Specular AA",
@@ -322,16 +310,16 @@
                     "displayName": "Blend Source",
                     "description": "The source to use for defining the blend mask. Note VertexColors mode will still use the texture as a fallback if the mesh does not have a COLOR0 stream.",
                     "type": "Enum",
-                    "enumValues":  ["TextureMap", "VertexColors"],
-                    "defaultValue":  "TextureMap",
+                    "enumValues":  ["BlendMaskTexture", "BlendMaskVertexColors", "Displacement", "Displacement_With_BlendMaskTexture", "Displacement_With_BlendMaskVertexColors"],
+                    "defaultValue":  "BlendMaskTexture",
                     "connection": {
                         "type": "ShaderOption",
-                        "id": "o_blendSource"
+                        "id": "o_layerBlendSource"
                     }
                 },
                 {
                     "id": "textureMap",
-                    "displayName": "Blend Mask",
+                    "displayName": "Blend Mask Texture",
                     "description": "RGB image where each channel is the blend mask for one of the three available layers.",
                     "type": "Image",
                     "defaultValue": "Textures/DefaultBlendMask_layers.png",
@@ -351,15 +339,44 @@
                         "type": "ShaderInput",
                         "id": "m_blendMaskUvIndex"
                     }
+                },
+                {
+                    "id": "displacementBlendDistance",
+                    "displayName": "Blend Distance",
+                    "description": "Adjusts how smoothly to transition between layers when displacement blending is enabled.",
+                    "type": "Float",
+                    "defaultValue": 0.0,
+                    "min": 0.0,
+                    "softMax": 0.1,
+                    "step": 0.001,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_displacementBlendDistance"
+                    }
+                },
+                {
+                    "id": "debugDrawMode",
+                    "displayName": "Debug Draw Mode",
+                    "description": "Enables various debug view features.",
+                    "type": "Enum",
+                    "enumValues": [ "None", "BlendMask", "Displacement", "FinalBlendWeights" ],
+                    "defaultValue": "None",
+                    "connection": {
+                        "type": "ShaderOption",
+                        "id": "o_debugDrawMode"
+                    }
                 }
             ],
             "parallax": [
                 {
+                    // Note parallax is enabled by default so that as soon as a user hooks up displacement settings they will see some parallax applied. 
+                    // The functor that controls parallax will set o_parallax_feature_enabled=false when all the individual layers have no displacement, so
+                    // a default value of true here will not have any initial impact on performance.
                     "id": "enable",
                     "displayName": "Enable",
                     "description": "Whether to enable the parallax feature for this material.",
                     "type": "Bool",
-                    "defaultValue": false
+                    "defaultValue": true
                 }, 
                 {
                     "id": "parallaxUv",
@@ -391,7 +408,7 @@
                     "description": "Quality of parallax mapping.",
                     "type": "Enum",
                     "enumValues": [ "Low", "Medium", "High", "Ultra" ],
-                    "defaultValue": "Medium",
+                    "defaultValue": "Low",
                     "connection": {
                         "type": "ShaderOption",
                         "id": "o_parallax_quality"
@@ -427,7 +444,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -1090,29 +1107,40 @@
                 }
             ],
             "layer1_parallax": [
-                {
-                    "id": "enable",
-                    "displayName": "Enable",
-                    "description": "Whether to enable the parallax feature.",
-                    "type": "Bool",
-                    "defaultValue": false
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
-                    "description": "Depthmap to create parallax effect.",
+                    "description": "Displacement texture map, which can be used for layer blending and/or a parallax effect.",
                     "type": "Image",
                     "connection": {
                         "type": "ShaderInput",
                         "id": "m_layer1_m_depthMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
+                {
+                    "id": "invert",
+                    "displayName": "Invert",
+                    "description": "Invert the displacement map",
+                    "type": "Bool",
+                    "defaultValue": true,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_layer1_m_depthInverted"
+                    }
+                },
                 {
                     "id": "factor",
-                    "displayName": "Heightmap Scale",
-                    "description": "The total height of the heightmap in local model units.",
+                    "displayName": "Scale",
+                    "description": "The total height of the displacement texture map in local model units.",
                     "type": "Float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 0.05,
                     "min": 0.0,
                     "softMax": 0.1,
                     "connection": {
@@ -1132,17 +1160,6 @@
                         "type": "ShaderInput",
                         "id": "m_layer1_m_depthOffset"
                     }
-                },
-                {
-                    "id": "invert",
-                    "displayName": "Invert",
-                    "description": "Invert to depthmap if the texture is heightmap",
-                    "type": "Bool",
-                    "defaultValue": true,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_layer1_m_depthInverted"
-                    }
                 }
             ],
             "layer1_uv": [
@@ -1152,7 +1169,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -1796,29 +1813,40 @@
                 }
             ],
             "layer2_parallax": [
-                {
-                    "id": "enable",
-                    "displayName": "Enable",
-                    "description": "Whether to enable the parallax feature.",
-                    "type": "Bool",
-                    "defaultValue": false
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
-                    "description": "Depthmap to create parallax effect.",
+                    "description": "Displacement texture map, which can be used for layer blending and/or a parallax effect.",
                     "type": "Image",
                     "connection": {
                         "type": "ShaderInput",
                         "id": "m_layer2_m_depthMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
+                {
+                    "id": "invert",
+                    "displayName": "Invert",
+                    "description": "Invert the displacement map",
+                    "type": "Bool",
+                    "defaultValue": true,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_layer2_m_depthInverted"
+                    }
+                },
                 {
                     "id": "factor",
-                    "displayName": "Heightmap Scale",
-                    "description": "The total height of the heightmap in local model units.",
+                    "displayName": "Scale",
+                    "description": "The total height of the displacement texture map in local model units.",
                     "type": "Float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 0.05,
                     "min": 0.0,
                     "softMax": 0.1,
                     "connection": {
@@ -1838,17 +1866,6 @@
                         "type": "ShaderInput",
                         "id": "m_layer2_m_depthOffset"
                     }
-                },
-                {
-                    "id": "invert",
-                    "displayName": "Invert",
-                    "description": "Invert to depthmap if the texture is heightmap",
-                    "type": "Bool",
-                    "defaultValue": true,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_layer2_m_depthInverted"
-                    }
                 }
             ],
             "layer2_uv": [
@@ -1858,7 +1875,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -2502,29 +2519,40 @@
                 }
             ],
             "layer3_parallax": [
-                {
-                    "id": "enable",
-                    "displayName": "Enable",
-                    "description": "Whether to enable the parallax feature.",
-                    "type": "Bool",
-                    "defaultValue": false
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
-                    "description": "Depthmap to create parallax effect.",
+                    "description": "Displacement texture map, which can be used for layer blending and/or a parallax effect.",
                     "type": "Image",
                     "connection": {
                         "type": "ShaderInput",
                         "id": "m_layer3_m_depthMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
+                {
+                    "id": "invert",
+                    "displayName": "Invert",
+                    "description": "Invert the displacement map",
+                    "type": "Bool",
+                    "defaultValue": true,
+                    "connection": {
+                        "type": "ShaderInput",
+                        "id": "m_layer3_m_depthInverted"
+                    }
+                },
                 {
                     "id": "factor",
-                    "displayName": "Heightmap Scale",
-                    "description": "The total height of the heightmap in local model units.",
+                    "displayName": "Scale",
+                    "description": "The total height of the displacement texture map in local model units.",
                     "type": "Float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 0.05,
                     "min": 0.0,
                     "softMax": 0.1,
                     "connection": {
@@ -2544,17 +2572,6 @@
                         "type": "ShaderInput",
                         "id": "m_layer3_m_depthOffset"
                     }
-                },
-                {
-                    "id": "invert",
-                    "displayName": "Invert",
-                    "description": "Invert to depthmap if the texture is heightmap",
-                    "type": "Bool",
-                    "defaultValue": true,
-                    "connection": {
-                        "type": "ShaderInput",
-                        "id": "m_layer3_m_depthInverted"
-                    }
                 }
             ],
             "layer3_uv": [
@@ -2564,7 +2581,7 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
@@ -2699,7 +2716,7 @@
         {
             "type": "Lua",
             "args": {
-                "file": "StandardMultilayerPBR_Parallax.lua"
+                "file": "StandardMultilayerPBR_Displacement.lua"
             }
         },
         //##############################################################################################
@@ -2816,12 +2833,12 @@
             }
         },
         {
-            "type": "Lua",
+            "type": "UseTexture",
             "args": {
-                "file": "StandardMultilayerPBR_ParallaxPerLayer.lua",
-                "propertyNamePrefix": "layer1_",
-                "srgNamePrefix": "m_layer1_",
-                "optionsNamePrefix": "o_layer1_"
+                "textureProperty": "layer1_parallax.textureMap",
+                "useTextureProperty": "layer1_parallax.useTexture",
+                "dependentProperties": ["layer1_parallax.factor", "layer1_parallax.invert"],
+                "shaderOption": "o_layer1_o_useDepthMap"    
             }
         },
         {
@@ -2953,12 +2970,12 @@
             }
         },
         {
-            "type": "Lua",
+            "type": "UseTexture",
             "args": {
-                "file": "StandardMultilayerPBR_ParallaxPerLayer.lua",
-                "propertyNamePrefix": "layer2_",
-                "srgNamePrefix": "m_layer2_",
-                "optionsNamePrefix": "o_layer2_"
+                "textureProperty": "layer2_parallax.textureMap",
+                "useTextureProperty": "layer2_parallax.useTexture",
+                "dependentProperties": ["layer2_parallax.factor", "layer2_parallax.invert"],
+                "shaderOption": "o_layer2_o_useDepthMap"    
             }
         },
         {
@@ -3090,14 +3107,14 @@
             }
         },
         {
-            "type": "Lua",
+            "type": "UseTexture",
             "args": {
-                "file": "StandardMultilayerPBR_ParallaxPerLayer.lua",
-                "propertyNamePrefix": "layer3_",
-                "srgNamePrefix": "m_layer3_",
-                "optionsNamePrefix": "o_layer3_"
+                "textureProperty": "layer3_parallax.textureMap",
+                "useTextureProperty": "layer3_parallax.useTexture",
+                "dependentProperties": ["layer3_parallax.factor", "layer3_parallax.invert"],
+                "shaderOption": "o_layer3_o_useDepthMap"    
             }
-        }, 
+        },
         {
             // Maps 2D scale, offset, and rotate properties into a float3x3 transform matrix.
             "type": "Transform2D",
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
index d2314efefe..c20a90c00b 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Common.azsli
@@ -15,6 +15,7 @@
 #include <Atom/Features/SrgSemantics.azsli>
 #include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
 #include <Atom/Features/PBR/LightingOptions.azsli>
+#include <Atom/RPI/Math.azsli>
 
 #include "MaterialInputs/BaseColorInput.azsli"
 #include "MaterialInputs/RoughnessInput.azsli"
@@ -42,9 +43,19 @@ COMMON_SRG_INPUTS_PARALLAX(prefix)
 
 ShaderResourceGroup MaterialSrg : SRG_PerMaterial
 {
-    Texture2D m_blendMaskTexture; 
+    Texture2D m_blendMaskTexture;
     uint m_blendMaskUvIndex;
     
+    // When parallax mapping is used, these limit the heightmap intersection search range to the narrowest band possible, to give the best quality result.
+    // These are also support other calculations related to displacement-based blending, even when parallax is not used.
+    float m_displacementMin; // The lowest displacement value possible from all layers combined (negative values are below the surface)
+    float m_displacementMax; // The highest displacement value possible from all layers combined (negative values are below the surface)
+    
+    // When displacement-based blending is used, this is the height range where the surface properties of different layers will be blended together.
+    // We use an absolute value rather than a relative factor because disconnecting this property from the influence of other properties makes per-layer 
+    // displacement adjustments feel more natural if they don't impact the blend distance.
+    float m_displacementBlendDistance;
+
     // Auto-generate material SRG fields for common inputs for each layer
     DEFINE_LAYER_SRG_INPUTS(m_layer1_)
     DEFINE_LAYER_SRG_INPUTS(m_layer2_)
@@ -61,10 +72,6 @@ ShaderResourceGroup MaterialSrg : SRG_PerMaterial
     
     uint m_parallaxUvIndex;
 
-    // These are used to limit the heightmap intersection search range to the narrowest band possible, to give the best quality result.
-    float m_displacementMin; // The lowest displacement value possible from all layers combined
-    float m_displacementMax; // The highest displacement value possible from all layers combined
-
     float3x3 m_uvMatrix;
     float4 m_pad4; // [GFX TODO][ATOM-14595] This is a workaround for a data stomping bug. Remove once it's fixed.
     float3x3 m_uvMatrixInverse;
@@ -98,11 +105,11 @@ ShaderResourceGroup MaterialSrg : SRG_PerMaterial
 option bool o_layer2_enabled;
 option bool o_layer3_enabled;
 
-enum class DebugDrawMode { None, BlendSource, DepthMaps };
+enum class DebugDrawMode { None, BlendMask, Displacement, FinalBlendWeights };
 option DebugDrawMode o_debugDrawMode;
 
-enum class BlendMaskSource { TextureMap, VertexColors, Fallback };
-option BlendMaskSource o_blendSource;
+enum class LayerBlendSource { BlendMaskTexture, BlendMaskVertexColors, Displacement, Displacement_With_BlendMaskTexture, Displacement_With_BlendMaskVertexColors, Fallback };
+option LayerBlendSource o_layerBlendSource;
 
 // Indicates whether the vertex input struct's "m_optional_blendMask" is bound. If false, it is not safe to read from m_optional_blendMask.
 // This option gets set automatically by the system at runtime; there is a soft naming convention that associates it with m_optional_blendMask.
@@ -111,53 +118,83 @@ option BlendMaskSource o_blendSource;
 option bool o_blendMask_isBound;
 
 // ------ Blend Utilities ----------------------------------------
-
 // This is mainly used to pass extra data to the GetDepth callback function during the parallax depth search.
 // But since we have it, we use it in some other functions as well rather than passing it around.
 static float3 s_blendMaskFromVertexStream;
 
-//! Returns the BlendMaskSource that will actually be used when rendering (not necessarily the same BlendMaskSource specified by the user)
-BlendMaskSource GetFinalBlendMaskSource()
+// TODO: Consider storing the result of GetFinalLayerBlendSource() in a static similar to s_blendMaskFromVertexStream. That might give better performance when variants aren't used.
+
+//! Returns the LayerBlendSource that will actually be used when rendering (not necessarily the same LayerBlendSource specified by the user)
+LayerBlendSource GetFinalLayerBlendSource()
 {    
-    if(o_blendSource == BlendMaskSource::TextureMap)
+    if(o_layerBlendSource == LayerBlendSource::BlendMaskTexture)
     {
-        return BlendMaskSource::TextureMap;
+        return o_layerBlendSource;
     }
-    else if(o_blendSource == BlendMaskSource::VertexColors)
+    else if(o_layerBlendSource == LayerBlendSource::BlendMaskVertexColors)
     {
         if(o_blendMask_isBound)
         {
-            return BlendMaskSource::VertexColors;
+            return o_layerBlendSource;
         }
         else
         {
-            return BlendMaskSource::TextureMap;
+            return LayerBlendSource::Fallback;
+        }
+    }
+    else if(o_layerBlendSource == LayerBlendSource::Displacement)
+    {
+        return o_layerBlendSource;
+    }
+    else if(o_layerBlendSource == LayerBlendSource::Displacement_With_BlendMaskTexture)
+    {
+        return o_layerBlendSource;
+    }
+    else if(o_layerBlendSource == LayerBlendSource::Displacement_With_BlendMaskVertexColors)
+    {
+        if(o_blendMask_isBound)
+        {
+            return o_layerBlendSource;
+        }
+        else
+        {
+            return LayerBlendSource::Displacement;
         }
     }
     else
     {
-        return BlendMaskSource::Fallback;
+        return LayerBlendSource::Fallback;
     }
 }
 
-//! Return the raw blend source values directly from the blend mask or vertex colors, depending on the available data and configuration.
+//! Return the applicable blend mask values from the blend mask texture or vertex colors, and filters out any that don't apply.
 //!     layer1 is an implicit base layer
-//!     layer2 is weighted by r
-//!     layer3 is weighted by g
+//!     layer2 mask is in the r channel
+//!     layer3 mask is in the g channel
 //!     b is reserved for perhaps a dedicated puddle layer
-float3 GetBlendSourceValues(float2 uv)
+//! @param blendSource indicates where to get the blend mask from
+//! @param blendMaskUv for sampling a blend mask texture, if that's the blend source
+//! @param blendMaskVertexColors the vertex color values to use for the blend mask, if that's the blend source
+//! @return the blend mask values, or 0 if there is no blend mask
+float3 GetApplicableBlendMaskValues(LayerBlendSource blendSource, float2 blendMaskUv, float3 blendMaskVertexColors)
 {
     float3 blendSourceValues = float3(0,0,0);
 
     if(o_layer2_enabled || o_layer3_enabled)
     {
-        switch(GetFinalBlendMaskSource())
+        switch(blendSource)
         {
-            case BlendMaskSource::TextureMap:
-                blendSourceValues = MaterialSrg::m_blendMaskTexture.Sample(MaterialSrg::m_sampler, uv).rgb;
+            case LayerBlendSource::Displacement:
+                // In this case the blend mask has no effect, returning (1,1,1) disables any impact of the mask.
+                blendSourceValues = float3(1,1,1);
                 break;
-            case BlendMaskSource::VertexColors:
-                blendSourceValues = s_blendMaskFromVertexStream;
+            case LayerBlendSource::BlendMaskTexture:
+            case LayerBlendSource::Displacement_With_BlendMaskTexture:
+                blendSourceValues = MaterialSrg::m_blendMaskTexture.Sample(MaterialSrg::m_sampler, blendMaskUv).rgb;
+                break;
+            case LayerBlendSource::BlendMaskVertexColors:
+            case LayerBlendSource::Displacement_With_BlendMaskVertexColors:
+                blendSourceValues = blendMaskVertexColors;
                 break;
         }
 
@@ -175,29 +212,96 @@ float3 GetBlendSourceValues(float2 uv)
     return blendSourceValues;
 }
 
-//! Return the final blend mask values to be used for rendering, based on the available data and configuration.
+//! When dealing with masks for displacement-based blending, we sometimes need to push the value below the min displacement to make it disappear.
+float GetSubMinDisplacement()
+{
+    return MaterialSrg::m_displacementMin - 0.001;
+    //return MaterialSrg::m_displacementMin - max(MaterialSrg::m_displacementBlendDistance, 0.001);
+}
+
+float3 ApplyBlendMaskToDepthValues(float3 blendMaskValues, float3 layerDepthValues, float zeroMaskDisplacement);
+
+//! Return the final blend weights to be used for rendering, based on the available data and configuration.
+//! @param blendSource - indicates where to get the blend mask from
+//! @param blendMaskValues - blend mask values as returned by GetApplicableBlendMaskValues()
+//! @param layerDepthValues - the depth values for each layer, used if the blend source includes displacement. See GetLayerDepthValues().
+//!                           Note the blendMaskValues will not be applied here, those should have already been applied to layerDepthValues.
+//! @param layerDepthBlendDistance - controls how smoothly to blend layers 2 and 3 with the base layer, when the blend source includes displacement.
+//!                                  When layers are close together their weights will be blended together, otherwise the highest layer will have the full weight.
 //! @return The blend weights for each layer.
-//!         Even though layer1 not explicitly specified in the blend source data, it is explicitly included with the returned values.
+//!         Even though layer1 not explicitly specified in the blend mask data, it is explicitly included with the returned values.
 //!         layer1 = r
 //!         layer2 = g
 //!         layer3 = b
-float3 GetBlendWeights(float2 uv)
+float3 GetBlendWeights(LayerBlendSource blendSource, float3 blendMaskValues, float3 layerDepthValues, float layerDepthBlendDistance)
 {
     float3 blendWeights;
     
     if(o_layer2_enabled || o_layer3_enabled)
     {
-        float3 blendSourceValues = GetBlendSourceValues(uv);
+        if(LayerBlendSource::Displacement == blendSource || 
+           LayerBlendSource::Displacement_With_BlendMaskTexture == blendSource || 
+           LayerBlendSource::Displacement_With_BlendMaskVertexColors == blendSource)
+        {
+            // Calculate the blend weights based on displacement values...
 
-        // Calculate blend weights such that multiplying and adding them with layer data is equivalent
-        // to lerping between each layer.
-        //     final = lerp(final, layer1, blendWeights.r)
-        //     final = lerp(final, layer2, blendWeights.g)
-        //     final = lerp(final, layer3, blendWeights.b)
+            // The inputs are depth values, but we change them to height values to make the code a bit more intuitive.
+            float3 layerHeightValues = -layerDepthValues;
+
+            float highestPoint = layerHeightValues.x;
+            if(o_layer2_enabled)
+            {
+                highestPoint = max(highestPoint, layerHeightValues.y);
+            }
+            if(o_layer3_enabled)
+            {
+                highestPoint = max(highestPoint, layerHeightValues.z);
+            }
+            
+            if(layerDepthBlendDistance > 0.0001)
+            {
+                float lowestVisiblePoint = highestPoint - layerDepthBlendDistance;
+                blendWeights = smoothstep(lowestVisiblePoint, highestPoint, layerHeightValues);
+            
+                if(!o_layer2_enabled)
+                {
+                    blendWeights.y = 0.0;
+                }
+            
+                if(!o_layer3_enabled)
+                {
+                    blendWeights.z = 0.0;
+                }
+            }
+            else
+            {
+                blendWeights = float3(layerHeightValues.x >= highestPoint ? 1.0 : 0.0,
+                                        layerHeightValues.y >= highestPoint && o_layer2_enabled ? 1.0 : 0.0,
+                                        layerHeightValues.z >= highestPoint && o_layer3_enabled ? 1.0 : 0.0);
+            }
+            
+            // Calculate blend weights such that multiplying and adding them with layer data is equivalent
+            // to lerping between each layer.
+            //     final = lerp(final, layer1, blendWeights.r)
+            //     final = lerp(final, layer2, blendWeights.g)
+            //     final = lerp(final, layer3, blendWeights.b)
+
+            blendWeights.y = (1 - blendWeights.z) * blendWeights.y;
+            blendWeights.x = 1 - blendWeights.y - blendWeights.z;
+        }
+        else
+        {
+            // Calculate blend weights such that multiplying and adding them with layer data is equivalent
+            // to lerping between each layer.
+            //     final = lerp(final, layer1, blendWeights.r)
+            //     final = lerp(final, layer2, blendWeights.g)
+            //     final = lerp(final, layer3, blendWeights.b)
+
+            blendWeights.b = blendMaskValues.g;
+            blendWeights.g = (1.0 - blendMaskValues.g) * blendMaskValues.r;
+            blendWeights.r = (1.0 - blendMaskValues.g) * (1.0 - blendMaskValues.r);
+        }
 
-        blendWeights.b = blendSourceValues.g;
-        blendWeights.g = (1.0 - blendSourceValues.g) * blendSourceValues.r;
-        blendWeights.r = (1.0 - blendSourceValues.g) * (1.0 - blendSourceValues.r);
     }
     else
     {
@@ -207,6 +311,38 @@ float3 GetBlendWeights(float2 uv)
     return blendWeights;
 }
 
+float3 GetLayerDepthValues(float2 uv, float2 uv_ddx, float2 uv_ddy);
+
+//! Return the final blend weights to be used for rendering, based on the available data and configuration.
+//! Note this will sample the displacement maps in the case of LayerBlendSource::Displacement. If you have already
+//! the layer depth values, use the GetBlendWeights() overload that takes layerDepthValues instead.
+float3 GetBlendWeights(LayerBlendSource blendSource, float2 uv, float3 blendMaskVertexColors)
+{
+    float3 layerDepthValues = float3(0,0,0);
+    
+    float3 blendMaskValues = GetApplicableBlendMaskValues(blendSource, uv, blendMaskVertexColors);
+
+    if(blendSource == LayerBlendSource::Displacement ||
+       blendSource == LayerBlendSource::Displacement_With_BlendMaskTexture ||
+       blendSource == LayerBlendSource::Displacement_With_BlendMaskVertexColors)
+    {
+        bool useBlendMask = 
+           LayerBlendSource::Displacement_With_BlendMaskTexture == blendSource || 
+           LayerBlendSource::Displacement_With_BlendMaskVertexColors == blendSource;
+           
+        layerDepthValues = GetLayerDepthValues(uv, ddx_fine(uv), ddy_fine(uv));
+
+        if(useBlendMask)
+        {
+            // Unlike the GetDepth() callback used for parallax, we don't just shift the values toward GetSubMinDisplacement(),
+            // we shift extra to ensure that completely masked-out layers are not blended onto upper layers.
+            layerDepthValues = ApplyBlendMaskToDepthValues(blendMaskValues, layerDepthValues, GetSubMinDisplacement() - MaterialSrg::m_displacementBlendDistance);
+        }
+    }
+    
+    return GetBlendWeights(blendSource, blendMaskValues, layerDepthValues, MaterialSrg::m_displacementBlendDistance);
+}
+
 float BlendLayers(float layer1, float layer2, float layer3, float3 blendWeights)
 {
     return dot(float3(layer1, layer2, layer3), blendWeights);
@@ -236,55 +372,127 @@ bool ShouldHandleParallaxInDepthShaders()
     return ShouldHandleParallax() && o_parallax_enablePixelDepthOffset;
 }
 
-// Callback function for ParallaxMapping.azsli
-DepthResult GetDepth(float2 uv, float2 uv_ddx, float2 uv_ddy)
+//! Returns the depth values for each layer.
+float3 GetLayerDepthValues(float2 uv, float2 uv_ddx, float2 uv_ddy)
 {
     float3 layerDepthValues = float3(0,0,0);
-
-    if(o_layer1_o_useDepthMap)
+    
+    // layer1
     {
-        float2 layerUv = uv;
-        if(MaterialSrg::m_parallaxUvIndex == 0)
+        if(o_layer1_o_useDepthMap)
         {
-            layerUv = mul(MaterialSrg::m_layer1_m_uvMatrix, float3(uv, 1.0)).xy;
+            float2 layerUv = uv;
+            if(MaterialSrg::m_parallaxUvIndex == 0)
+            {
+                layerUv = mul(MaterialSrg::m_layer1_m_uvMatrix, float3(uv, 1.0)).xy;
+            }
+
+            layerDepthValues.r = SampleDepthOrHeightMap(MaterialSrg::m_layer1_m_depthInverted, MaterialSrg::m_layer1_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
+            layerDepthValues.r *= MaterialSrg::m_layer1_m_depthFactor;
         }
 
-        layerDepthValues.r = SampleDepthOrHeightMap(MaterialSrg::m_layer1_m_depthInverted, MaterialSrg::m_layer1_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
-        layerDepthValues.r *= MaterialSrg::m_layer1_m_depthFactor;
         layerDepthValues.r -= MaterialSrg::m_layer1_m_depthOffset;
     }
     
-    if(o_layer2_enabled && o_layer2_o_useDepthMap)
+    if(o_layer2_enabled)
     {
-        float2 layerUv = uv;
-        if(MaterialSrg::m_parallaxUvIndex == 0)
+        if(o_layer2_o_useDepthMap)
         {
-            layerUv = mul(MaterialSrg::m_layer2_m_uvMatrix, float3(uv, 1.0)).xy;
+            float2 layerUv = uv;
+            if(MaterialSrg::m_parallaxUvIndex == 0)
+            {
+                layerUv = mul(MaterialSrg::m_layer2_m_uvMatrix, float3(uv, 1.0)).xy;
+            }
+
+            layerDepthValues.g = SampleDepthOrHeightMap(MaterialSrg::m_layer2_m_depthInverted, MaterialSrg::m_layer2_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
+            layerDepthValues.g *= MaterialSrg::m_layer2_m_depthFactor;
         }
 
-        layerDepthValues.g = SampleDepthOrHeightMap(MaterialSrg::m_layer2_m_depthInverted, MaterialSrg::m_layer2_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
-        layerDepthValues.g *= MaterialSrg::m_layer2_m_depthFactor;
         layerDepthValues.g -= MaterialSrg::m_layer2_m_depthOffset;
+
     }
     
-    if(o_layer3_enabled && o_layer3_o_useDepthMap)
+    if(o_layer3_enabled)
     {
-        float2 layerUv = uv;
-        if(MaterialSrg::m_parallaxUvIndex == 0)
+        if(o_layer3_o_useDepthMap)
         {
-            layerUv = mul(MaterialSrg::m_layer3_m_uvMatrix, float3(uv, 1.0)).xy;
+            float2 layerUv = uv;
+            if(MaterialSrg::m_parallaxUvIndex == 0)
+            {
+                layerUv = mul(MaterialSrg::m_layer3_m_uvMatrix, float3(uv, 1.0)).xy;
+            }
+
+            layerDepthValues.b = SampleDepthOrHeightMap(MaterialSrg::m_layer3_m_depthInverted, MaterialSrg::m_layer3_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
+            layerDepthValues.b *= MaterialSrg::m_layer3_m_depthFactor;
         }
 
-        layerDepthValues.b = SampleDepthOrHeightMap(MaterialSrg::m_layer3_m_depthInverted, MaterialSrg::m_layer3_m_depthMap, MaterialSrg::m_sampler, layerUv, uv_ddx, uv_ddy).m_depth;
-        layerDepthValues.b *= MaterialSrg::m_layer3_m_depthFactor;
         layerDepthValues.b -= MaterialSrg::m_layer3_m_depthOffset;
+
     }
     
-    // Note, when the blend source is BlendMaskSource::VertexColors, parallax will not be able to blend correctly between layers. It will end up using the same blend mask values
-    // for every UV position when searching for the intersection. This leads to smearing artifacts at the transition point, but these won't be so noticeable as long as
-    // you have a small depth factor relative to the size of the blend transition.
-    float3 blendWeights = GetBlendWeights(uv);
+    return layerDepthValues;
+}
+
+
+//! Uses a layer blend mask to further displace each layer's surface so that it disappears beyond the other surfaces.
+//! Note the blend mask does not apply to the first layer, it is the implicit base layer. Layers 2 and 3 are masked by the r and g channels of the mask.
+//! @param blendMaskValues layer mask values as returned by GetApplicableBlendMaskValues()
+//! @param layerDepthValues layer depth values as returned by GetLayerDepthValues()
+//! @param zeroMaskDisplacement the target displacement value that corresponds to a mask value of 0
+//! @return new layer depth values that have been adjusted according to the layerMaskValues
+float3 ApplyBlendMaskToDepthValues(float3 blendMaskValues, float3 layerDepthValues, float zeroMaskDisplacement)
+{
+    if(o_layer2_enabled || o_layer3_enabled)
+    {        
+        // We add to the depth value rather than lerp toward m_displacementMin to avoid squashing the topology, but instead lower it out of sight.
+
+        if(o_layer2_enabled)
+        {
+            float dropoffRange = MaterialSrg::m_layer2_m_depthOffset - zeroMaskDisplacement;
+            layerDepthValues.g += dropoffRange * (1-blendMaskValues.r);
+        }
+        
+        if(o_layer3_enabled)
+        {
+            float dropoffRange = MaterialSrg::m_layer3_m_depthOffset - zeroMaskDisplacement;
+            layerDepthValues.b += dropoffRange * (1-blendMaskValues.g);
+        }
+    }
+
+    return layerDepthValues;
+}
+
+//! Callback function for ParallaxMapping.azsli
+DepthResult GetDepth(float2 uv, float2 uv_ddx, float2 uv_ddy)
+{
+    LayerBlendSource blendSource = GetFinalLayerBlendSource();
+
+    float3 layerDepthValues = GetLayerDepthValues(uv, uv_ddx, uv_ddy);
+    
+    // Note, when the blend source uses the blend mask from the vertex colors, parallax will not be able to blend correctly between layers. It will end up using the same blend mask values
+    // for every UV position when searching for the intersection. This leads to smearing artifacts at the transition point, but these won't be as noticeable if
+    // you have a small depth factor relative to the size of the blend transition.
+    float3 blendMaskValues = GetApplicableBlendMaskValues(blendSource, uv, s_blendMaskFromVertexStream);
+        
+    bool useBlendMask = 
+       LayerBlendSource::Displacement_With_BlendMaskTexture == blendSource || 
+       LayerBlendSource::Displacement_With_BlendMaskVertexColors == blendSource;
+
+    if(useBlendMask)
+    {
+        // Regarding GetSubMinDisplacement(), when a mask of 0 pushes the surface all the way to the bottom, we want that 
+        // to go a little below the min so it will disappear if there is something else right at the min.
+        
+        layerDepthValues = ApplyBlendMaskToDepthValues(blendMaskValues, layerDepthValues, GetSubMinDisplacement());
+    }
+    
+    // When blending the depth together, we don't use MaterialSrg::m_displacementBlendDistance. The intention is that m_displacementBlendDistance
+    // is for transitioning the appearance of the surface itself, but we still want a distinct change in the heightmap. If someday we want to 
+    // support smoothly blending the depth as well, there is a bit more work to do to get it to play nice with the blend mask code in GetLayerDepthValues().
+    float layerDepthBlendDistance = 0.0f;
+    float3 blendWeightValues = GetBlendWeights(blendSource, blendMaskValues, layerDepthValues, layerDepthBlendDistance);
+    
+    float depth = BlendLayers(layerDepthValues.r, layerDepthValues.g, layerDepthValues.b, blendWeightValues);
 
-    float depth = BlendLayers(layerDepthValues.r, layerDepthValues.g, layerDepthValues.b, blendWeights);
     return DepthResultAbsolute(depth);
 }
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
index 178deca8a2..cf4d53e805 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
@@ -84,7 +84,7 @@ VSDepthOutput MainVS(VSInput IN)
     }
     else
     {
-        OUT.m_blendMask = float3(1,1,1);
+        OUT.m_blendMask = float3(0,0,0);
     }
 
     return OUT;
@@ -103,11 +103,11 @@ PSDepthOutput MainPS(VSDepthOutput IN, bool isFrontFace : SV_IsFrontFace)
     
     if(ShouldHandleParallaxInDepthShaders())
     {
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
-             
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
+
         s_blendMaskFromVertexStream = IN.m_blendMask;
         
         float depth;
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
new file mode 100644
index 0000000000..d2bf8f28d3
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Displacement.lua
@@ -0,0 +1,195 @@
+--------------------------------------------------------------------------------------
+--
+-- All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+-- its licensors.
+--
+-- For complete copyright and license terms please see the LICENSE at the root of this
+-- distribution (the "License"). All use of this software is governed by the License,
+-- or, if provided, by the license below or the license accompanying this file. Do not
+-- remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--
+--
+----------------------------------------------------------------------------------------------------
+
+-- This functor handles general parallax properties that affect the entire material.
+
+function GetMaterialPropertyDependencies()
+    return { 
+        "blend.blendSource",
+        "blend.enableLayer2",
+        "blend.enableLayer3",
+        "parallax.enable",
+        "layer1_parallax.textureMap",
+        "layer2_parallax.textureMap",
+        "layer3_parallax.textureMap",
+        "layer1_parallax.useTexture",
+        "layer2_parallax.useTexture",
+        "layer3_parallax.useTexture",
+        "layer1_parallax.factor",
+        "layer2_parallax.factor",
+        "layer3_parallax.factor",
+        "layer1_parallax.offset",
+        "layer2_parallax.offset",
+        "layer3_parallax.offset"
+    }
+end
+
+function GetShaderOptionDependencies()
+    return {"o_parallax_feature_enabled"}
+end
+
+-- These values must align with LayerBlendSource in StandardMultilayerPBR_Common.azsli.
+LayerBlendSource_BlendMaskTexture = 0
+LayerBlendSource_BlendMaskVertexColors = 1
+LayerBlendSource_Displacement = 2
+LayerBlendSource_Displacement_With_BlendMaskTexture = 3
+LayerBlendSource_Displacement_With_BlendMaskVertexColors = 4
+
+function BlendSourceUsesDisplacement(context)
+    local blendSource = context:GetMaterialPropertyValue_enum("blend.blendSource")
+    local blendSourceIncludesDisplacement = (blendSource == LayerBlendSource_Displacement or 
+                                             blendSource == LayerBlendSource_Displacement_With_BlendMaskTexture or 
+                                             blendSource == LayerBlendSource_Displacement_With_BlendMaskVertexColors)
+    return blendSourceIncludesDisplacement
+end
+
+function IsParallaxNeededForLayer(context, layerNumber)
+    local enableLayer = true
+    if(layerNumber > 1) then -- layer 1 is always enabled, it is the implicit base layer
+        enableLayer = context:GetMaterialPropertyValue_bool("blend.enableLayer" .. layerNumber)
+    end
+
+    if not enableLayer then
+        return false
+    end
+    
+    local parallaxGroupName = "layer" .. layerNumber .. "_parallax."
+
+    local factor = context:GetMaterialPropertyValue_float(parallaxGroupName .. "factor")
+    local offset = context:GetMaterialPropertyValue_float(parallaxGroupName .. "offset")
+    
+    if factor == 0.0 and offset == 0.0 then
+        return false
+    end
+
+    local hasTexture = nil ~= context:GetMaterialPropertyValue_Image(parallaxGroupName .. "textureMap")
+    local useTexture = context:GetMaterialPropertyValue_bool(parallaxGroupName .. "useTexture")
+    
+    if not hasTexture or not useTexture then
+        factorLayer = 0.0
+    end
+    
+    if factor == 0.0 and offset == 0.0 then
+        return false
+    end
+    
+    return true
+end
+
+-- Calculates the min and max displacement height values encompassing all enabled layers.
+-- @return a table with two values {min,max}. Negative values are below the surface and positive values are above the surface.
+function CalcOverallHeightRange(context)
+    
+    local heightMinMax = {nil, nil}
+
+    local function GetMergedHeightRange(heightMinMax, offset, factor)
+        top = offset
+        bottom = offset - factor
+
+        if(heightMinMax[1] == nil) then
+            heightMinMax[1] = top
+        else
+            heightMinMax[1] = math.max(heightMinMax[1], top)
+        end
+    
+        if(heightMinMax[0] == nil) then
+            heightMinMax[0] = bottom
+        else
+            heightMinMax[0] = math.min(heightMinMax[0], bottom)
+        end
+    end
+    
+    local enableParallax = context:GetMaterialPropertyValue_bool("parallax.enable")
+
+    if(enableParallax or BlendSourceUsesDisplacement(context)) then
+        local hasTextureLayer1 = nil ~= context:GetMaterialPropertyValue_Image("layer1_parallax.textureMap")
+        local hasTextureLayer2 = nil ~= context:GetMaterialPropertyValue_Image("layer2_parallax.textureMap")
+        local hasTextureLayer3 = nil ~= context:GetMaterialPropertyValue_Image("layer3_parallax.textureMap")
+        
+        local useTextureLayer1 = context:GetMaterialPropertyValue_bool("layer1_parallax.useTexture")
+        local useTextureLayer2 = context:GetMaterialPropertyValue_bool("layer2_parallax.useTexture")
+        local useTextureLayer3 = context:GetMaterialPropertyValue_bool("layer3_parallax.useTexture")
+
+        local factorLayer1 = context:GetMaterialPropertyValue_float("layer1_parallax.factor")
+        local factorLayer2 = context:GetMaterialPropertyValue_float("layer2_parallax.factor")
+        local factorLayer3 = context:GetMaterialPropertyValue_float("layer3_parallax.factor")
+
+        if not hasTextureLayer1 or not useTextureLayer1 then factorLayer1 = 0 end
+        if not hasTextureLayer2 or not useTextureLayer2 then factorLayer2 = 0 end
+        if not hasTextureLayer3 or not useTextureLayer3 then factorLayer3 = 0 end
+
+        local offsetLayer1 = context:GetMaterialPropertyValue_float("layer1_parallax.offset")
+        local offsetLayer2 = context:GetMaterialPropertyValue_float("layer2_parallax.offset")
+        local offsetLayer3 = context:GetMaterialPropertyValue_float("layer3_parallax.offset")
+        
+        local enableLayer2 = context:GetMaterialPropertyValue_bool("blend.enableLayer2")
+        local enableLayer3 = context:GetMaterialPropertyValue_bool("blend.enableLayer3")
+
+        GetMergedHeightRange(heightMinMax, offsetLayer1, factorLayer1)
+        if(enableLayer2) then GetMergedHeightRange(heightMinMax, offsetLayer2, factorLayer2) end
+        if(enableLayer3) then GetMergedHeightRange(heightMinMax, offsetLayer3, factorLayer3) end
+
+    else
+        heightMinMax = {0,0}
+    end
+
+    return heightMinMax
+end
+
+function Process(context)
+    local heightMinMax = CalcOverallHeightRange(context)
+    context:SetShaderConstant_float("m_displacementMin", heightMinMax[0])
+    context:SetShaderConstant_float("m_displacementMax", heightMinMax[1])
+    
+    local parallaxFeatureEnabled = context:GetMaterialPropertyValue_bool("parallax.enable")
+    if parallaxFeatureEnabled then
+        if not IsParallaxNeededForLayer(context, 1) and
+           not IsParallaxNeededForLayer(context, 2) and
+           not IsParallaxNeededForLayer(context, 3) then
+            parallaxFeatureEnabled = false
+        end
+    end
+    
+    context:SetShaderOptionValue_bool("o_parallax_feature_enabled", parallaxFeatureEnabled)
+end
+
+function ProcessEditor(context)
+    local enableParallaxSettings = context:GetMaterialPropertyValue_bool("parallax.enable")
+    
+    local parallaxSettingVisibility = MaterialPropertyVisibility_Enabled
+    if(not enableParallaxSettings) then
+        parallaxSettingVisibility = MaterialPropertyVisibility_Hidden
+    end
+    
+    context:SetMaterialPropertyVisibility("parallax.parallaxUv", parallaxSettingVisibility)
+    context:SetMaterialPropertyVisibility("parallax.algorithm", parallaxSettingVisibility)
+    context:SetMaterialPropertyVisibility("parallax.quality", parallaxSettingVisibility)
+    context:SetMaterialPropertyVisibility("parallax.pdo", parallaxSettingVisibility)
+    context:SetMaterialPropertyVisibility("parallax.showClipping", parallaxSettingVisibility)
+    
+    if BlendSourceUsesDisplacement(context) then
+        context:SetMaterialPropertyVisibility("blend.displacementBlendDistance", MaterialPropertyVisibility_Enabled)
+    else
+        context:SetMaterialPropertyVisibility("blend.displacementBlendDistance", MaterialPropertyVisibility_Hidden)
+    end
+    
+    -- We set the displacementBlendDistance slider range to match the range of displacement, so the slider will feel good
+    -- regardless of how big the overall displacement is. Using a soft max allows the user to exceed the limit if desired,
+    -- but the main reason for the *soft* max is to avoid impacting the value of displacementBlendDistance which could 
+    -- otherwise lead to edge cases.
+    local heightMinMax = CalcOverallHeightRange(context)
+    local totalDisplacementRange = heightMinMax[1] - heightMinMax[0]
+    context:SetMaterialPropertySoftMaxValue_float("blend.displacementBlendDistance", math.max(totalDisplacementRange, 0.001))
+end
+
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
index 580e5206ab..19efc60a1e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
@@ -116,7 +116,7 @@ VSOutput ForwardPassVS(VSInput IN)
     }
     else
     {
-        OUT.m_blendMask = float3(1,1,1);
+        OUT.m_blendMask = float3(0,0,0);
     }
     
     // Shadow coords will be calculated in the pixel shader in this case
@@ -310,38 +310,45 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
 
     s_blendMaskFromVertexStream = IN.m_blendMask;
 
+    LayerBlendSource blendSource = GetFinalLayerBlendSource();
+
     // ------- Tangents & Bitangets -------
+    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
 
-    // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-
-    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering && MaterialSrg::m_parallaxUvIndex != 0)
-        || (o_layer1_o_normal_useTexture && MaterialSrg::m_layer1_m_normalMapUvIndex != 0)
-        || (o_layer2_o_normal_useTexture && MaterialSrg::m_layer2_m_normalMapUvIndex != 0)
-        || (o_layer3_o_normal_useTexture && MaterialSrg::m_layer3_m_normalMapUvIndex != 0)
-        || (o_layer1_o_clearCoat_normal_useTexture && MaterialSrg::m_layer1_m_clearCoatNormalMapUvIndex != 0)
-        || (o_layer2_o_clearCoat_normal_useTexture && MaterialSrg::m_layer2_m_clearCoatNormalMapUvIndex != 0)
-        || (o_layer3_o_clearCoat_normal_useTexture && MaterialSrg::m_layer3_m_clearCoatNormalMapUvIndex != 0)
+    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering)
+        || o_layer1_o_normal_useTexture
+        || o_layer2_o_normal_useTexture
+        || o_layer3_o_normal_useTexture
+        || o_layer1_o_clearCoat_normal_useTexture
+        || o_layer2_o_clearCoat_normal_useTexture
+        || o_layer3_o_clearCoat_normal_useTexture
         )
     {
-        // Generate the tangent/bitangent for UV[1+]
-        const int startIndex = 1;
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, startIndex);
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
     }
     
     // ------- Debug Modes -------
 
-    if(o_debugDrawMode == DebugDrawMode::BlendSource)
+    if(o_debugDrawMode == DebugDrawMode::BlendMask)
     {
-        float3 blendSource = GetBlendSourceValues(IN.m_uv[MaterialSrg::m_blendMaskUvIndex]);
-        return DebugOutput(blendSource);
+        float3 blendMaskValues = GetApplicableBlendMaskValues(blendSource, IN.m_uv[MaterialSrg::m_blendMaskUvIndex], IN.m_blendMask);
+        return DebugOutput(blendMaskValues);
     }
     
-    if(o_debugDrawMode == DebugDrawMode::DepthMaps)
+    if(o_debugDrawMode == DebugDrawMode::Displacement)
     {
-        float depth = GetNormalizedDepth(-MaterialSrg::m_displacementMax, -MaterialSrg::m_displacementMin, IN.m_uv[MaterialSrg::m_parallaxUvIndex], float2(0,0), float2(0,0));
-        return DebugOutput(float3(depth,depth,depth));
+        float startDepth = -MaterialSrg::m_displacementMax;
+        float stopDepth = -MaterialSrg::m_displacementMin;
+        float depth = GetNormalizedDepth(startDepth, stopDepth, IN.m_uv[MaterialSrg::m_parallaxUvIndex], float2(0,0), float2(0,0));
+        float height = 1 - saturate(depth);
+        return DebugOutput(float3(height,height,height));
+    }
+    
+    if(o_debugDrawMode == DebugDrawMode::FinalBlendWeights)
+    {
+        float3 blendWeights = GetBlendWeights(blendSource, IN.m_uv[MaterialSrg::m_blendMaskUvIndex], IN.m_blendMask);
+        return DebugOutput(blendWeights);
     }
 
     // ------- Parallax -------
@@ -373,21 +380,27 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     // ------- Calculate Layer Blend Mask Values -------
     
     // Now that any parallax has been calculated, we calculate the blend factors for any layers that are impacted by the parallax.
-    float3 blendWeights = GetBlendWeights(IN.m_uv[MaterialSrg::m_blendMaskUvIndex]);
+    float3 blendWeights = GetBlendWeights(blendSource, IN.m_uv[MaterialSrg::m_blendMaskUvIndex], IN.m_blendMask);
 
     // ------- Layer 1 (base layer) -----------
 
     ProcessedMaterialInputs lightingInputLayer1;
+    if(blendWeights.r > 0)
     {
         StandardMaterialInputs inputs;
         FILL_STANDARD_MATERIAL_INPUTS(inputs, MaterialSrg::m_layer1_, o_layer1_, blendWeights.r)
         lightingInputLayer1 = ProcessStandardMaterialInputs(inputs);
     }
+    else
+    {
+        lightingInputLayer1.InitializeToZero();
+        blendWeights.r = 0;
+    }
     
     // ----------- Layer 2 -----------
 
     ProcessedMaterialInputs lightingInputLayer2; 
-    if(o_layer2_enabled)
+    if(o_layer2_enabled && blendWeights.g > 0)
     {
         StandardMaterialInputs inputs;
         FILL_STANDARD_MATERIAL_INPUTS(inputs, MaterialSrg::m_layer2_, o_layer2_, blendWeights.g)
@@ -396,12 +409,13 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     else
     {
         lightingInputLayer2.InitializeToZero();
+        blendWeights.g = 0;
     }
     
     // ----------- Layer 3 -----------
 
     ProcessedMaterialInputs lightingInputLayer3;
-    if(o_layer3_enabled)
+    if(o_layer3_enabled && blendWeights.b > 0)
     {
         StandardMaterialInputs inputs;
         FILL_STANDARD_MATERIAL_INPUTS(inputs, MaterialSrg::m_layer3_, o_layer3_, blendWeights.b)
@@ -410,6 +424,7 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
     else
     {
         lightingInputLayer3.InitializeToZero();
+        blendWeights.b = 0;
     }
 
     // ------- Combine all layers ---------
@@ -420,12 +435,16 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
 
     // ------- Combine Normals ---------
 
-    float3 normalTS = lightingInputLayer1.m_normalTS;
-    if(o_layer2_enabled)
+    float3 normalTS = float3(0,0,1);
+    if(blendWeights.r > 0)
+    {
+        normalTS = lightingInputLayer1.m_normalTS;
+    }
+    if(o_layer2_enabled && blendWeights.g > 0)
     {
         normalTS = ReorientTangentSpaceNormal(normalTS, lightingInputLayer2.m_normalTS);
     }
-    if(o_layer3_enabled)
+    if(o_layer3_enabled && blendWeights.b > 0)
     {
         normalTS = ReorientTangentSpaceNormal(normalTS, lightingInputLayer3.m_normalTS);
     }
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Parallax.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Parallax.lua
deleted file mode 100644
index 8880a4b842..0000000000
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Parallax.lua
+++ /dev/null
@@ -1,97 +0,0 @@
---------------------------------------------------------------------------------------
---
--- All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
--- its licensors.
---
--- For complete copyright and license terms please see the LICENSE at the root of this
--- distribution (the "License"). All use of this software is governed by the License,
--- or, if provided, by the license below or the license accompanying this file. Do not
--- remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---
---
-----------------------------------------------------------------------------------------------------
-
--- This functor handles general parallax properties that affect the entire material.
-
-function GetMaterialPropertyDependencies()
-    return { 
-        "parallax.enable",
-        "layer1_parallax.enable",
-        "layer2_parallax.enable",
-        "layer3_parallax.enable",
-        "layer1_parallax.factor",
-        "layer2_parallax.factor",
-        "layer3_parallax.factor",
-        "layer1_parallax.offset",
-        "layer2_parallax.offset",
-        "layer3_parallax.offset" 
-    }
-end
-
-function GetShaderOptionDependencies()
-    return {"o_parallax_feature_enabled"}
-end
- 
-function MergeRange(heightMinMax, offset, factor)
-    top = offset
-    bottom = offset - factor
-
-    if(heightMinMax[1] == nil) then
-        heightMinMax[1] = top
-    else
-        heightMinMax[1] = math.max(heightMinMax[1], top)
-    end
-    
-    if(heightMinMax[0] == nil) then
-        heightMinMax[0] = bottom
-    else
-        heightMinMax[0] = math.min(heightMinMax[0], bottom)
-    end
-end
-
-function Process(context)
-    local enableParallax = context:GetMaterialPropertyValue_bool("parallax.enable")
-    local enable1 = context:GetMaterialPropertyValue_bool("layer1_parallax.enable")
-    local enable2 = context:GetMaterialPropertyValue_bool("layer2_parallax.enable")
-    local enable3 = context:GetMaterialPropertyValue_bool("layer3_parallax.enable")
-    enableParallax = enableParallax and (enable1 or enable2 or enable3)
-    context:SetShaderOptionValue_bool("o_parallax_feature_enabled", enableParallax)
-    
-    if(enableParallax) then
-        local factorLayer1 = context:GetMaterialPropertyValue_float("layer1_parallax.factor")
-        local factorLayer2 = context:GetMaterialPropertyValue_float("layer2_parallax.factor")
-        local factorLayer3 = context:GetMaterialPropertyValue_float("layer3_parallax.factor")
-
-        local offsetLayer1 = context:GetMaterialPropertyValue_float("layer1_parallax.offset")
-        local offsetLayer2 = context:GetMaterialPropertyValue_float("layer2_parallax.offset")
-        local offsetLayer3 = context:GetMaterialPropertyValue_float("layer3_parallax.offset")
-
-        local heightMinMax = {nil, nil}
-        if(enable1) then MergeRange(heightMinMax, offsetLayer1, factorLayer1) end
-        if(enable2) then MergeRange(heightMinMax, offsetLayer2, factorLayer2) end
-        if(enable3) then MergeRange(heightMinMax, offsetLayer3, factorLayer3) end
-
-        if(heightMinMax[1] - heightMinMax[0] < 0.0001) then
-            context:SetShaderOptionValue_bool("o_parallax_feature_enabled", false)
-        else
-            context:SetShaderConstant_float("m_displacementMin", heightMinMax[0])
-            context:SetShaderConstant_float("m_displacementMax", heightMinMax[1])
-        end
-    end
-end
-
-function ProcessEditor(context)
-    local enable = context:GetMaterialPropertyValue_bool("parallax.enable")
-    
-    local visibility = MaterialPropertyVisibility_Enabled
-    if(not enable) then
-        visibility = MaterialPropertyVisibility_Hidden
-    end
-    
-    context:SetMaterialPropertyVisibility("parallax.parallaxUv", visibility)
-    context:SetMaterialPropertyVisibility("parallax.algorithm", visibility)
-    context:SetMaterialPropertyVisibility("parallax.quality", visibility)
-    context:SetMaterialPropertyVisibility("parallax.pdo", visibility)
-    context:SetMaterialPropertyVisibility("parallax.showClipping", visibility)
-end
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ParallaxPerLayer.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ParallaxPerLayer.lua
deleted file mode 100644
index bd56292229..0000000000
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_ParallaxPerLayer.lua
+++ /dev/null
@@ -1,49 +0,0 @@
---------------------------------------------------------------------------------------
---
--- All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
--- its licensors.
---
--- For complete copyright and license terms please see the LICENSE at the root of this
--- distribution (the "License"). All use of this software is governed by the License,
--- or, if provided, by the license below or the license accompanying this file. Do not
--- remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
---
---
-----------------------------------------------------------------------------------------------------
-
--- This functor handles parallax properties that are specific to a single layer.
-
-function GetMaterialPropertyDependencies()
-    return {"parallax.enable", "parallax.textureMap"}
-end
-
-function GetShaderOptionDependencies()
-    return {"o_useDepthMap"}
-end
- 
-function Process(context)
-    local enable = context:GetMaterialPropertyValue_bool("parallax.enable")
-    local textureMap = context:GetMaterialPropertyValue_Image("parallax.textureMap")
-    context:SetShaderOptionValue_bool("o_useDepthMap", enable and textureMap ~= nil)
-end
-
-function ProcessEditor(context)
-    local enable = context:GetMaterialPropertyValue_bool("parallax.enable")
-    
-    if enable then
-        context:SetMaterialPropertyVisibility("parallax.textureMap", MaterialPropertyVisibility_Enabled)
-    else 
-        context:SetMaterialPropertyVisibility("parallax.textureMap", MaterialPropertyVisibility_Hidden)
-    end
-    
-    local textureMap = context:GetMaterialPropertyValue_Image("parallax.textureMap")
-    local visibility = MaterialPropertyVisibility_Enabled
-    if(not enable or textureMap == nil) then
-        visibility = MaterialPropertyVisibility_Hidden
-    end
-    
-    context:SetMaterialPropertyVisibility("parallax.factor", visibility)
-    context:SetMaterialPropertyVisibility("parallax.offset", visibility)
-    context:SetMaterialPropertyVisibility("parallax.invert", visibility)
-end
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
index 02ccd78735..6c80dc874b 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
@@ -83,7 +83,7 @@ VertexOutput MainVS(VertexInput IN)
     }
     else
     {
-        OUT.m_blendMask = float3(1,1,1);
+        OUT.m_blendMask = float3(0,0,0);
     }
 
     return OUT;
@@ -102,10 +102,10 @@ PSDepthOutput MainPS(VertexOutput IN, bool isFrontFace : SV_IsFrontFace)
 
     if(ShouldHandleParallaxInDepthShaders())
     {
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
              
         s_blendMaskFromVertexStream = IN.m_blendMask;
         
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
index 2b0d09bc5c..ca3e5e1ce4 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR.materialtype
@@ -601,7 +601,7 @@
                     "displayName": "Opacity Mode",
                     "description": "Opacity mode for this texture.",
                     "type": "Enum",
-                    "enumValues": [ "Opaque", "Cutout", "Blended" ],
+                    "enumValues": [ "Opaque", "Cutout", "Blended", "TintedTransparent" ],
                     "defaultValue": "Opaque",
                     "connection": {
                         "type": "ShaderOption",
@@ -669,12 +669,12 @@
                     "description": "Center point for scaling and rotation transformations.",
                     "type": "vector2",
                     "vectorLabels": [ "U", "V" ],
-                    "defaultValue": [ 0.0, 0.0 ]
+                    "defaultValue": [ 0.5, 0.5 ]
                 },
                 {
                     "id": "tileU",
                     "displayName": "Tile U",
-                    "description": "Scales texture coordinates in V.",
+                    "description": "Scales texture coordinates in U.",
                     "type": "float",
                     "defaultValue": 1.0,
                     "step": 0.1
@@ -879,13 +879,6 @@
                 }
             ],
             "parallax": [
-                {
-                    "id": "enable",
-                    "displayName": "Enable",
-                    "description": "Whether to enable the parallax feature.",
-                    "type": "Bool",
-                    "defaultValue": false
-                },
                 {
                     "id": "textureMap",
                     "displayName": "Texture Map",
@@ -896,6 +889,13 @@
                         "id": "m_depthMap"
                     }
                 },
+                {
+                    "id": "useTexture",
+                    "displayName": "Use Texture",
+                    "description": "Whether to use the texture map.",
+                    "type": "Bool",
+                    "defaultValue": true
+                },
                 {
                     "id": "textureMapUv",
                     "displayName": "UV",
@@ -913,7 +913,7 @@
                     "displayName": "Heightmap Scale",
                     "description": "The total height of the heightmap in local model units.",
                     "type": "Float",
-                    "defaultValue": 0.0,
+                    "defaultValue": 0.05,
                     "min": 0.0,
                     "softMax": 0.1,
                     "connection": {
@@ -951,7 +951,7 @@
                     "description": "Select the algorithm to use for parallax mapping.",
                     "type": "Enum",
                     "enumValues": [ "Basic", "Steep", "POM", "Relief", "ContactRefinement" ],
-                    "defaultValue": "Basic",
+                    "defaultValue": "POM",
                     "connection": {
                         "type": "ShaderOption",
                         "id": "o_parallax_algorithm"
@@ -1139,7 +1139,7 @@
                     "type": "float",
                     "defaultValue": 6.0,
                     "min": 0.0,
-                    "softMax":  20.0
+                    "softMax": 20.0
                 },
                 {
                     "id": "transmissionDistortion",
@@ -1170,7 +1170,7 @@
                 }
             ],
             "irradiance": [
-                // Note: this property group is used in the DiffuseGlobalIllumination pass, it is not read by the StandardPBR shader
+                // Note: this property group is used in the DiffuseGlobalIllumination pass and not by the main forward shader
                 {
                     "id": "color",
                     "displayName": "Color",
@@ -1277,18 +1277,18 @@
             "type": "HandleSubsurfaceScatteringParameters",
             "args": {
                 "mode": "subsurfaceScattering.transmissionMode",
-                "scale" : "subsurfaceScattering.transmissionScale",
-                "power" : "subsurfaceScattering.transmissionPower",
-                "distortion" : "subsurfaceScattering.transmissionDistortion",
-                "attenuation" : "subsurfaceScattering.transmissionAttenuation",
-                "tintColor" : "subsurfaceScattering.transmissionTint",
-                "thickness" : "subsurfaceScattering.thickness",
+                "scale": "subsurfaceScattering.transmissionScale",
+                "power": "subsurfaceScattering.transmissionPower",
+                "distortion": "subsurfaceScattering.transmissionDistortion",
+                "attenuation": "subsurfaceScattering.transmissionAttenuation",
+                "tintColor": "subsurfaceScattering.transmissionTint",
+                "thickness": "subsurfaceScattering.thickness",
                 "enabled": "subsurfaceScattering.enableSubsurfaceScattering",
-                "scatterDistanceColor" : "subsurfaceScattering.scatterColor",
-                "scatterDistanceIntensity" : "subsurfaceScattering.scatterDistance",
-                "scatterDistanceShaderInput" : "m_scatterDistance",
-                "parametersShaderInput" : "m_transmissionParams",
-                "tintThickenssShaderInput" : "m_transmissionTintThickness"
+                "scatterDistanceColor": "subsurfaceScattering.scatterColor",
+                "scatterDistanceIntensity": "subsurfaceScattering.scatterDistance",
+                "scatterDistanceShaderInput": "m_scatterDistance",
+                "parametersShaderInput": "m_transmissionParams",
+                "tintThickenssShaderInput": "m_transmissionTintThickness"
             }
         },
         {
@@ -1387,15 +1387,6 @@
                 "file": "StandardPBR_HandleOpacityDoubleSided.lua"
             }
         },
-        {
-            "type": "OverrideDrawList",
-            "args": {
-                "triggerProperty": "opacity.mode",
-                "triggerValue": "Blended",
-                "shaderIndex": 1,
-                "drawList": "transparent"
-            }
-        },
         {
             "type": "Lua",
             "args": {
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
index 28708c12d5..afc93f060e 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_DepthPass_WithPS.azsl
@@ -78,10 +78,10 @@ PSDepthOutput MainPS(VSDepthOutput IN, bool isFrontFace : SV_IsFrontFace)
 
     if(ShouldHandleParallaxInDepthShaders())
     {
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
     
         float3x3 uvMatrix = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3();
         float3x3 uvMatrixInverse = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrixInverse : CreateIdentity3x3();
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
index bf1ec96b79..10fa3814f3 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ForwardPass.azsl
@@ -110,19 +110,12 @@ VSOutput StandardPbr_ForwardPassVS(VSInput IN)
 PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float depthNDC)
 {
     // ------- Tangents & Bitangets -------
+    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
 
-    // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-    float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-    float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-
-    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering && MaterialSrg::m_parallaxUvIndex != 0)
-        || (o_normal_useTexture && MaterialSrg::m_normalMapUvIndex != 0)
-        || (o_clearCoat_enabled && o_clearCoat_normal_useTexture && MaterialSrg::m_clearCoatNormalMapUvIndex != 0)
-        )
+    if ((o_parallax_feature_enabled && !o_enableSubsurfaceScattering) || o_normal_useTexture || (o_clearCoat_enabled && o_clearCoat_normal_useTexture))
     {
-        // Generate the tangent/bitangent for UV[1+]
-        const int startIndex = 1;
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, startIndex);
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
     }
 
     // ------- Depth & Parallax -------
@@ -301,6 +294,24 @@ PbrLightingOutput ForwardPassPS_Common(VSOutput IN, bool isFrontFace, out float
         lightingOutput.m_diffuseColor.rgb *= lightingOutput.m_diffuseColor.w; // pre-multiply diffuse
         lightingOutput.m_diffuseColor.rgb += lightingOutput.m_specularColor.rgb; // add specular
     }
+    else if (o_opacity_mode == OpacityMode::TintedTransparent)
+    {
+        // See OpacityMode::Blended above for the basic method. TintedTransparent adds onto the above concept by supporting
+        // colored alpha. This is currently a very basic calculation that uses the baseColor as a multiplier with strength
+        // determined by the alpha. We'll modify this later to be more physically accurate and allow surface depth,
+        // absorption, and interior color to be specified.
+        //
+        // The technique uses dual source blending to allow two separate sources to be part of the blending equation
+        // even though ultimately only a single render target is being written to. m_diffuseColor is render target 0 and
+        // m_specularColor render target 1, and the blend mode is (dest * source1color) + (source * 1.0).
+        //
+        // This means that m_specularColor.rgb (source 1) is multiplied against the destination, then
+        // m_diffuseColor.rgb (source) is added to that, and the final result is stored in render target 0.
+
+        lightingOutput.m_diffuseColor.rgb *= lightingOutput.m_diffuseColor.w; // pre-multiply diffuse
+        lightingOutput.m_diffuseColor.rgb += lightingOutput.m_specularColor.rgb; // add specular
+        lightingOutput.m_specularColor.rgb = baseColor * (1.0 - lightingOutput.m_diffuseColor.w); 
+    }
     else
     {
         // Pack factor and quality, drawback: because of precision limit of float16 cannot represent exact 1, maximum representable value is 0.9961
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
index 541b1ac1ce..20d3ee47ae 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_HandleOpacityMode.lua
@@ -60,10 +60,13 @@ function Process(context)
 
     if(opacityMode == OpacityMode_Blended) then
         ConfigureAlphaBlending(context:GetShader(ForwardPassIndex))
+        context:GetShader(ForwardPassIndex):SetDrawListTagOverride("transparent")
     elseif(opacityMode == OpacityMode_TintedTransparent) then
         ConfigureDualSourceBlending(context:GetShader(ForwardPassIndex))
+        context:GetShader(ForwardPassIndex):SetDrawListTagOverride("transparent")
     else
         ResetAlphaBlending(context:GetShader(ForwardPassIndex))
+        context:GetShader(ForwardPassIndex):SetDrawListTagOverride("") -- reset to default draw list
     end
 end
 
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
index e6689da327..53d6334f28 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ParallaxState.lua
@@ -13,7 +13,7 @@
 ----------------------------------------------------------------------------------------------------
 
 function GetMaterialPropertyDependencies()
-    return {"parallax.enable", "parallax.textureMap"}
+    return {"parallax.textureMap", "parallax.useTexture"}
 end
 
 function GetShaderOptionDependencies()
@@ -21,27 +21,31 @@ function GetShaderOptionDependencies()
 end
  
 function Process(context)
-    local enable = context:GetMaterialPropertyValue_bool("parallax.enable")
     local textureMap = context:GetMaterialPropertyValue_Image("parallax.textureMap")
+    local useTexture = context:GetMaterialPropertyValue_bool("parallax.useTexture")
+    local enable = textureMap ~= nil and useTexture 
     context:SetShaderOptionValue_bool("o_parallax_feature_enabled", enable)
-    context:SetShaderOptionValue_bool("o_useDepthMap", enable and textureMap ~= nil)
+    context:SetShaderOptionValue_bool("o_useDepthMap", enable)
 end
 
 function ProcessEditor(context)
-    local enable = context:GetMaterialPropertyValue_bool("parallax.enable")
-    
-    if enable then
-        context:SetMaterialPropertyVisibility("parallax.textureMap", MaterialPropertyVisibility_Enabled)
-    else 
-        context:SetMaterialPropertyVisibility("parallax.textureMap", MaterialPropertyVisibility_Hidden)
-    end
-    
     local textureMap = context:GetMaterialPropertyValue_Image("parallax.textureMap")
-    local visibility = MaterialPropertyVisibility_Enabled
-    if(not enable or textureMap == nil) then
-        visibility = MaterialPropertyVisibility_Hidden
+    
+    if textureMap ~= nil then
+        context:SetMaterialPropertyVisibility("parallax.useTexture", MaterialPropertyVisibility_Enabled)
+    else 
+        context:SetMaterialPropertyVisibility("parallax.useTexture", MaterialPropertyVisibility_Hidden)
     end
     
+    local useTexture = context:GetMaterialPropertyValue_bool("parallax.useTexture")
+
+    local visibility = MaterialPropertyVisibility_Enabled
+    if(textureMap == nil) then
+        visibility = MaterialPropertyVisibility_Hidden
+    elseif not useTexture then
+        visibility = MaterialPropertyVisibility_Disabled
+    end
+        
     context:SetMaterialPropertyVisibility("parallax.factor", visibility)
     context:SetMaterialPropertyVisibility("parallax.offset", visibility)
     context:SetMaterialPropertyVisibility("parallax.showClipping", visibility)
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
index e502eb38f8..b245fde3df 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_ShaderEnable.lua
@@ -13,7 +13,7 @@
 ----------------------------------------------------------------------------------------------------
 
 function GetMaterialPropertyDependencies()
-    return {"opacity.mode", "parallax.enable", "parallax.pdo"}
+    return {"opacity.mode", "parallax.textureMap", "parallax.useTexture", "parallax.pdo"}
 end
 
 OpacityMode_Opaque = 0
@@ -21,41 +21,61 @@ OpacityMode_Cutout = 1
 OpacityMode_Blended = 2
 OpacityMode_TintedTransparent = 3
 
+function TryGetShaderByTag(context, shaderTag)
+    if context:HasShaderWithTag(shaderTag) then
+        return context:GetShaderByTag(shaderTag)
+    else
+        return nil
+    end
+end
+
+function TrySetShaderEnabled(shader, enabled)
+    if shader then 
+        shader:SetEnabled(enabled)
+    end
+end
+
 function Process(context)
     local opacityMode = context:GetMaterialPropertyValue_enum("opacity.mode")
-    local parallaxEnabled = context:GetMaterialPropertyValue_bool("parallax.enable")
+    local displacementMap = context:GetMaterialPropertyValue_Image("parallax.textureMap")
+    local useDisplacementMap = context:GetMaterialPropertyValue_bool("parallax.useTexture")
+    local parallaxEnabled = displacementMap ~= nil and useDisplacementMap
     local parallaxPdoEnabled = context:GetMaterialPropertyValue_bool("parallax.pdo")
     
     local depthPass = context:GetShaderByTag("DepthPass")
     local shadowMap = context:GetShaderByTag("Shadowmap")
     local forwardPassEDS = context:GetShaderByTag("ForwardPass_EDS")
-    local lowEndForwardEDS = context:GetShaderByTag("LowEndForward_EDS")
 
     local depthPassWithPS = context:GetShaderByTag("DepthPass_WithPS")
     local shadowMapWithPS = context:GetShaderByTag("Shadowmap_WithPS")
     local forwardPass = context:GetShaderByTag("ForwardPass")
-    local lowEndForward = context:GetShaderByTag("LowEndForward")
+
+    -- Use TryGetShaderByTag because these shaders only exist in StandardPBR but this script is also used for EnhancedPBR
+    local lowEndForwardEDS = TryGetShaderByTag(context, "LowEndForward_EDS")
+    local lowEndForward = TryGetShaderByTag(context, "LowEndForward")
     
     if parallaxEnabled and parallaxPdoEnabled then
         depthPass:SetEnabled(false)
         shadowMap:SetEnabled(false)
         forwardPassEDS:SetEnabled(false)
-        lowEndForwardEDS:SetEnabled(false)
         
         depthPassWithPS:SetEnabled(true)
         shadowMapWithPS:SetEnabled(true)
         forwardPass:SetEnabled(true)
-        lowEndForward:SetEnabled(true)
+
+        TrySetShaderEnabled(lowEndForwardEDS, false)
+        TrySetShaderEnabled(lowEndForward, true)
     else
         depthPass:SetEnabled(opacityMode == OpacityMode_Opaque)
         shadowMap:SetEnabled(opacityMode == OpacityMode_Opaque)
         forwardPassEDS:SetEnabled((opacityMode == OpacityMode_Opaque) or (opacityMode == OpacityMode_Blended) or (opacityMode == OpacityMode_TintedTransparent))
-        lowEndForwardEDS:SetEnabled((opacityMode == OpacityMode_Opaque) or (opacityMode == OpacityMode_Blended) or (opacityMode == OpacityMode_TintedTransparent))
         
         depthPassWithPS:SetEnabled(opacityMode == OpacityMode_Cutout)
         shadowMapWithPS:SetEnabled(opacityMode == OpacityMode_Cutout)
         forwardPass:SetEnabled(opacityMode == OpacityMode_Cutout)
-        lowEndForward:SetEnabled(opacityMode == OpacityMode_Cutout)
+
+        TrySetShaderEnabled(lowEndForwardEDS, (opacityMode == OpacityMode_Opaque) or (opacityMode == OpacityMode_Blended) or (opacityMode == OpacityMode_TintedTransparent))
+        TrySetShaderEnabled(lowEndForward, opacityMode == OpacityMode_Cutout)
     end
     
     context:GetShaderByTag("DepthPassTransparentMin"):SetEnabled((opacityMode == OpacityMode_Blended) or (opacityMode == OpacityMode_TintedTransparent))
diff --git a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
index 7f24b29700..533df3bb92 100644
--- a/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
+++ b/Gems/Atom/Feature/Common/Assets/Materials/Types/StandardPBR_Shadowmap_WithPS.azsl
@@ -81,10 +81,9 @@ PSDepthOutput MainPS(VertexOutput IN, bool isFrontFace : SV_IsFrontFace)
     {
         static const float ShadowMapDepthBias = 0.000001;
     
-        // We support two UV streams, but only a single stream of tangent/bitangent. So for UV[1+] we generated the tangent/bitangent in screen-space.
-        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, float3(0, 0, 0) };
-        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, float3(0, 0, 0) };
-        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents, 1);
+        float3 tangents[UvSetCount] = { IN.m_tangent.xyz, IN.m_tangent.xyz };
+        float3 bitangents[UvSetCount] = { IN.m_bitangent.xyz, IN.m_bitangent.xyz };
+        PrepareGeneratedTangent(IN.m_normal, IN.m_worldPosition, isFrontFace, IN.m_uv, UvSetCount, tangents, bitangents);
 
         float3x3 uvMatrix = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrix : CreateIdentity3x3();
         float3x3 uvMatrixInverse = MaterialSrg::m_parallaxUvIndex == 0 ? MaterialSrg::m_uvMatrixInverse : CreateIdentity3x3();
diff --git a/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo b/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo
index 53dbfb2623..72a7948174 100644
--- a/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo
+++ b/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo b/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo
index 3ae9447621..86d698d24e 100644
--- a/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo
+++ b/Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Atom/Feature/Common/Assets/Textures/sampleEnvironment/PaperMill_E_3k.exr.assetinfo b/Gems/Atom/Feature/Common/Assets/Textures/sampleEnvironment/PaperMill_E_3k.exr.assetinfo
index da00149fb0..16cb0dd668 100644
--- a/Gems/Atom/Feature/Common/Assets/Textures/sampleEnvironment/PaperMill_E_3k.exr.assetinfo
+++ b/Gems/Atom/Feature/Common/Assets/Textures/sampleEnvironment/PaperMill_E_3k.exr.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake b/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
index f1d8fa81be..841cdf67c8 100644
--- a/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
+++ b/Gems/Atom/Feature/Common/Assets/atom_feature_common_asset_files.cmake
@@ -33,11 +33,11 @@ set(FILES
     Materials/Types/StandardMultilayerPBR_Common.azsli
     Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.azsl
     Materials/Types/StandardMultilayerPBR_DepthPass_WithPS.shader
+    Materials/Types/StandardMultilayerPBR_Displacement.lua
     Materials/Types/StandardMultilayerPBR_ForwardPass.azsl
     Materials/Types/StandardMultilayerPBR_ForwardPass.shader
     Materials/Types/StandardMultilayerPBR_ForwardPass_EDS.shader
-    Materials/Types/StandardMultilayerPBR_Parallax.lua
-    Materials/Types/StandardMultilayerPBR_ParallaxPerLayer.lua
+    Materials/Types/StandardMultilayerPBR_LayerEnable.lua
     Materials/Types/StandardMultilayerPBR_ShaderEnable.lua
     Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.azsl
     Materials/Types/StandardMultilayerPBR_Shadowmap_WithPS.shader
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
index 15b416597d..73ce175d99 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h
@@ -14,6 +14,9 @@
 
 #include <AzCore/base.h>
 #include <Atom/RPI.Public/FeatureProcessor.h>
+#include <Atom/RHI.Reflect/Size.h>
+#include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
+#include <Atom/RPI.Reflect/Image/Image.h>
 
 namespace AZ
 {
@@ -23,6 +26,57 @@ namespace AZ
 
         using DiffuseProbeGridHandle = AZStd::shared_ptr<DiffuseProbeGrid>;
 
+        enum class DiffuseProbeGridMode : uint8_t
+        {
+            RealTime,
+            Baked,
+            AutoSelect
+        };
+
+        enum class DiffuseProbeGridTextureNotificationType
+        {
+            None,
+            Ready,
+            Error
+        };
+
+        struct DiffuseProbeGridTexture
+        {
+            const AZStd::shared_ptr<AZStd::vector<uint8_t>> m_data;
+            RHI::Format m_format;
+            RHI::Size m_size;
+        };
+
+        static const char* DiffuseProbeGridIrradianceFileName = "Irradiance_lutrgba16.dds";
+        static const char* DiffuseProbeGridDistanceFileName = "Distance_lutrg32f.dds";
+        static const char* DiffuseProbeGridRelocationFileName = "Relocation_lutrgba16f.dds";
+        static const char* DiffuseProbeGridClassificationFileName = "Classification_lutr32f.dds";
+
+        using DiffuseProbeGridBakeTexturesCallback = AZStd::function<void(
+            DiffuseProbeGridTexture irradianceTexture,
+            DiffuseProbeGridTexture distanceTexture,
+            DiffuseProbeGridTexture relocationTexture,
+            DiffuseProbeGridTexture classificationTexture)>;
+
+        struct DiffuseProbeGridBakedTextures
+        {
+            // irradiance and distance images can be used directly 
+            Data::Instance<RPI::Image> m_irradianceImage;
+            AZStd::string m_irradianceImageRelativePath;
+
+            Data::Instance<RPI::Image> m_distanceImage;
+            AZStd::string m_distanceImageRelativePath;
+
+            // relocation and classification images need to be recreated as RW textures
+            RHI::ImageDescriptor m_relocationImageDescriptor;
+            AZStd::array_view<uint8_t> m_relocationImageData;
+            AZStd::string m_relocationImageRelativePath;
+
+            RHI::ImageDescriptor m_classificationImageDescriptor;
+            AZStd::array_view<uint8_t> m_classificationImageData;
+            AZStd::string m_classificationImageRelativePath;
+        };
+
         // DiffuseProbeGridFeatureProcessorInterface provides an interface to the feature processor for code outside of Atom
         class DiffuseProbeGridFeatureProcessorInterface
             : public RPI::FeatureProcessor
@@ -44,6 +98,29 @@ namespace AZ
             virtual void Enable(const DiffuseProbeGridHandle& probeGrid, bool enable) = 0;
             virtual void SetGIShadows(const DiffuseProbeGridHandle& probeGrid, bool giShadows) = 0;
             virtual void SetUseDiffuseIbl(const DiffuseProbeGridHandle& probeGrid, bool useDiffuseIbl) = 0;
+            virtual void SetMode(const DiffuseProbeGridHandle& probeGrid, DiffuseProbeGridMode mode) = 0;
+            virtual void SetBakedTextures(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridBakedTextures& bakedTextures) = 0;
+
+            virtual void BakeTextures(
+                const DiffuseProbeGridHandle& probeGrid,
+                DiffuseProbeGridBakeTexturesCallback callback,
+                const AZStd::string& irradianceTextureRelativePath,
+                const AZStd::string& distanceTextureRelativePath,
+                const AZStd::string& relocationTextureRelativePath,
+                const AZStd::string& classificationTextureRelativePath) = 0;
+
+            // check for and retrieve a new baked texture asset (does not apply to hot-reloaded assets, only initial bakes)
+            virtual bool CheckTextureAssetNotification(
+                const AZStd::string& relativePath,
+                Data::Asset<RPI::StreamingImageAsset>& outTextureAsset,
+                DiffuseProbeGridTextureNotificationType& outNotificationType) = 0;
+
+            virtual bool AreBakedTexturesReferenced(
+                const AZStd::string& irradianceTextureRelativePath,
+                const AZStd::string& distanceTextureRelativePath,
+                const AZStd::string& relocationTextureRelativePath,
+                const AZStd::string& classificationTextureRelativePath) = 0;
+
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
index 101387205f..be761d8e7b 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.h
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #pragma once
 
@@ -26,14 +26,15 @@ namespace AZ
             , public AzToolsFramework::EditorEntityVisibilityNotificationBus::Handler
         {
         public:
-
             using BaseClass = AzToolsFramework::Components::EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration>;
-            AZ_RTTI((EditorRenderComponentAdapter, "{AAF38BE4-EA2F-408B-9C44-63C7FBAC6B33}", TController, TRuntimeComponent, TConfiguration), BaseClass);
+            AZ_RTTI(
+                (EditorRenderComponentAdapter, "{AAF38BE4-EA2F-408B-9C44-63C7FBAC6B33}", TController, TRuntimeComponent, TConfiguration),
+                BaseClass);
 
             static void Reflect(AZ::ReflectContext* context);
 
             EditorRenderComponentAdapter() = default;
-            EditorRenderComponentAdapter(const TConfiguration& config);
+            explicit EditorRenderComponentAdapter(const TConfiguration& config);
 
             // AzToolsFramework::Components::EditorComponentAdapter overrides
             void Activate() override;
@@ -50,7 +51,8 @@ namespace AZ
 
             // Convert pre-existing EditorCompnentAdapter based serialized data to EditorRenderComponentAdapter
             template<int TVersion>
-            static bool ConvertToEditorRenderComponentAdapter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
+            static bool ConvertToEditorRenderComponentAdapter(
+                AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement);
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
index e3f7ccd44d..633ec0e0ca 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/Utils/EditorRenderComponentAdapter.inl
@@ -1,14 +1,14 @@
 /*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
 
 #include <Atom/Feature/Utils/EditorRenderComponentAdapter.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
@@ -19,11 +19,12 @@ namespace AZ
     {
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
         template<int TVersion>
-        bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::ConvertToEditorRenderComponentAdapter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
+        bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::ConvertToEditorRenderComponentAdapter(
+            AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
         {
             if (classElement.GetVersion() < TVersion)
             {
-                // Get the and remove the EditorComponentAdapter base class data that was previpously serialized
+                // Get the and remove the EditorComponentAdapter base class data that was previously serialized
                 AzToolsFramework::Components::EditorComponentAdapter<TController, TRuntimeComponent, TConfiguration> oldBaseClassData;
 
                 if (!classElement.FindSubElementAndGetData(AZ_CRC("BaseClass1", 0xd4925735), oldBaseClassData))
@@ -41,8 +42,8 @@ namespace AZ
                 // Replace the old base class data with EditorRenderComponentAdapter
                 EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration> newBaseClassData;
 
-                AZ::SerializeContext::DataElementNode& newBaseClassElement = classElement.GetSubElement(
-                    classElement.AddElementWithData(context, "BaseClass1", newBaseClassData));
+                AZ::SerializeContext::DataElementNode& newBaseClassElement =
+                    classElement.GetSubElement(classElement.AddElementWithData(context, "BaseClass1", newBaseClassData));
 
                 // Overwrite EditorRenderComponentAdapter base class data with retrieved EditorComponentAdapter base class data
                 if (!newBaseClassElement.RemoveElementByName(AZ_CRC("BaseClass1", 0xd4925735)))
@@ -62,25 +63,24 @@ namespace AZ
         {
             BaseClass::Reflect(context);
 
-            if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
-                serializeContext->Class<EditorRenderComponentAdapter, BaseClass>()
-                    ->Version(0)
-                    ;
+                serializeContext->Class<EditorRenderComponentAdapter, BaseClass>()->Version(0);
 
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                 {
-                    editContext->Class<EditorRenderComponentAdapter>(
-                        "EditorRenderComponentAdapter", "")
+                    // clang-format off
+                    editContext->Class<EditorRenderComponentAdapter>("EditorRenderComponentAdapter", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ;
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
+                    // clang-format on
                 }
             }
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::EditorRenderComponentAdapter(const TConfiguration& config)
+        EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::EditorRenderComponentAdapter(
+            const TConfiguration& config)
             : BaseClass(config)
         {
         }
@@ -103,7 +103,8 @@ namespace AZ
         bool EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::IsVisible() const
         {
             bool visible = true;
-            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(visible, this->GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
+            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+                visible, this->GetEntityId(), &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsVisible);
             return visible;
         }
 
@@ -114,15 +115,16 @@ namespace AZ
         }
 
         template<typename TController, typename TRuntimeComponent, typename TConfiguration>
-        void EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::OnEntityVisibilityChanged([[maybe_unused]] bool visibility)
+        void EditorRenderComponentAdapter<TController, TRuntimeComponent, TConfiguration>::OnEntityVisibilityChanged(
+            [[maybe_unused]] bool visibility)
         {
             this->m_controller.Deactivate();
 
             if (this->ShouldActivateController())
             {
-                this->m_controller.Activate(this->GetEntityId());
+                AzFramework::Components::ComponentActivateHelper<TController>::Activate(
+                    this->m_controller, AZ::EntityComponentIdPair(this->GetEntityId(), this->GetId()));
             }
         }
-
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
index 089a6168b1..16f20d7178 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CommonSystemComponent.cpp
@@ -14,8 +14,6 @@
 #include <Source/Material/UseTextureFunctor.h>
 #include <Source/Material/SubsurfaceTransmissionParameterFunctor.h>
 #include <Source/Material/Transform2DFunctor.h>
-#include <Source/Material/ShaderEnableFunctor.h>
-#include <Source/Material/PropertyVisibilityFunctor.h>
 #include <Source/Material/DrawListFunctor.h>
 #include <Source/Material/ConvertEmissiveUnitFunctor.h>
 
@@ -114,7 +112,6 @@ namespace AZ
             ProjectedShadowFeatureProcessor::Reflect(context);
             SkyBoxFeatureProcessor::Reflect(context);
             UseTextureFunctor::Reflect(context);
-            PropertyVisibilityFunctor::Reflect(context);
             DrawListFunctor::Reflect(context);
             SubsurfaceTransmissionParameterFunctor::Reflect(context);
             Transform2DFunctor::Reflect(context);
@@ -126,7 +123,6 @@ namespace AZ
             DisplayMapperPassData::Reflect(context);
             ConvertEmissiveUnitFunctor::Reflect(context);
             LookupTableAsset::Reflect(context);
-            ShaderEnableFunctor::Reflect(context);
             ReflectionProbeFeatureProcessor::Reflect(context);
             DecalTextureArrayFeatureProcessor::Reflect(context);
             SMAAFeatureProcessor::Reflect(context);
diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
index 55fa633e5d..7c97af4f79 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
@@ -279,7 +279,7 @@ namespace AZ
             if (handle.IsValid())
             {
                 Quaternion orientation = world.GetRotation();
-                Vector3 scale = world.GetScale() * nonUniformScale;
+                Vector3 scale = world.GetUniformScale() * nonUniformScale;
 
                 SetDecalHalfSize(handle, scale);
                 SetDecalPosition(handle, world.GetTranslation());
diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
index febb0b16c5..e783f3b531 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
@@ -285,7 +285,7 @@ namespace AZ
         {
             if (handle.IsValid())
             {
-                SetDecalHalfSize(handle, nonUniformScale * world.GetScale());
+                SetDecalHalfSize(handle, nonUniformScale * world.GetUniformScale());
                 SetDecalPosition(handle, world.GetTranslation());
                 SetDecalOrientation(handle, world.GetRotation());
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
index 5be1303434..a55d8fc78c 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
@@ -13,6 +13,7 @@
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h>
 #include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
 #include <DiffuseProbeGrid/DiffuseProbeGrid.h>
+#include <Atom/RPI.Public/Image/StreamingImage.h>
 #include <Atom/RPI.Public/View.h>
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI/Factory.h>
@@ -23,6 +24,11 @@ namespace AZ
 {
     namespace Render
     {
+        DiffuseProbeGrid::DiffuseProbeGrid()
+            : m_textureReadback(this)
+        {
+        }
+
         DiffuseProbeGrid::~DiffuseProbeGrid()
         {
             m_scene->GetCullingScene()->UnregisterCullable(m_cullable);
@@ -166,6 +172,84 @@ namespace AZ
             m_updateRenderObjectSrg = true;
         }
 
+        void DiffuseProbeGrid::SetMode(DiffuseProbeGridMode mode)
+        {
+            // handle auto-select
+            if (mode == DiffuseProbeGridMode::AutoSelect)
+            {
+                RHI::Ptr<RHI::Device> device = RHI::RHISystemInterface::Get()->GetDevice();
+                m_mode = (device->GetFeatures().m_rayTracing) ? DiffuseProbeGridMode::RealTime : DiffuseProbeGridMode::Baked;
+            }
+            else
+            {
+                m_mode = mode;
+            }
+
+            m_updateTextures = true;
+        }
+
+        void DiffuseProbeGrid::SetBakedTextures(const DiffuseProbeGridBakedTextures& bakedTextures)
+        {
+            AZ_Assert(bakedTextures.m_irradianceImage.get(), "Invalid Irradiance image passed to SetBakedTextures");
+            AZ_Assert(bakedTextures.m_distanceImage.get(), "Invalid Distance image passed to SetBakedTextures");
+            AZ_Assert(bakedTextures.m_relocationImageData.size() > 0, "Invalid Relocation image data passed to SetBakedTextures");
+            AZ_Assert(bakedTextures.m_classificationImageData.size() > 0, "Invalid Classification image data passed to SetBakedTextures");
+
+            m_bakedIrradianceImage = bakedTextures.m_irradianceImage;
+            m_bakedDistanceImage = bakedTextures.m_distanceImage;
+
+            m_bakedIrradianceRelativePath = bakedTextures.m_irradianceImageRelativePath;
+            m_bakedDistanceRelativePath = bakedTextures.m_distanceImageRelativePath;
+            m_bakedRelocationRelativePath = bakedTextures.m_relocationImageRelativePath;
+            m_bakedClassificationRelativePath = bakedTextures.m_classificationImageRelativePath;
+
+            m_bakedRelocationImageData.resize(bakedTextures.m_relocationImageData.size());
+            memcpy(m_bakedRelocationImageData.data(), bakedTextures.m_relocationImageData.data(), bakedTextures.m_relocationImageData.size());
+
+            m_bakedClassificationImageData.resize(bakedTextures.m_classificationImageData.size());
+            memcpy(m_bakedClassificationImageData.data(), bakedTextures.m_classificationImageData.data(), bakedTextures.m_classificationImageData.size());
+
+            // create the relocation and distance RW textures now, these are needed for shader compatibility
+            // (image data is copied in UpdateTextures)
+            {
+                m_bakedRelocationImage = RHI::Factory::Get().CreateImage();
+                RHI::ImageInitRequest initRequest;
+                initRequest.m_image = m_bakedRelocationImage.get();
+                initRequest.m_descriptor = RHI::ImageDescriptor::Create2D(
+                    RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead,
+                    bakedTextures.m_relocationImageDescriptor.m_size.m_width,
+                    bakedTextures.m_relocationImageDescriptor.m_size.m_height,
+                    bakedTextures.m_relocationImageDescriptor.m_format);
+
+                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(initRequest);
+                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize Relocation image");
+            }
+            
+            {
+                m_bakedClassificationImage = RHI::Factory::Get().CreateImage();
+                RHI::ImageInitRequest initRequest;
+                initRequest.m_image = m_bakedClassificationImage.get();
+                initRequest.m_descriptor = RHI::ImageDescriptor::Create2D(
+                    RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead,
+                    bakedTextures.m_classificationImageDescriptor.m_size.m_width,
+                    bakedTextures.m_classificationImageDescriptor.m_size.m_height,
+                    bakedTextures.m_classificationImageDescriptor.m_format);
+
+                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(initRequest);
+                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize Classification image");
+            }
+
+            m_updateTextures = true;
+        }
+
+        bool DiffuseProbeGrid::HasValidBakedTextures() const
+        {
+            return m_bakedIrradianceImage.get() &&
+                m_bakedDistanceImage.get() &&
+                m_bakedRelocationImage.get() &&
+                m_bakedClassificationImage.get();
+        }
+
         uint32_t DiffuseProbeGrid::GetTotalProbeCount() const
         {
             return m_probeCountX * m_probeCountY * m_probeCountZ;
@@ -188,83 +272,117 @@ namespace AZ
 
             RHI::Ptr<RHI::Device> device = RHI::RHISystemInterface::Get()->GetDevice();
 
-            // advance to the next image in the frame image array
-            m_currentImageIndex = (m_currentImageIndex + 1) % ImageFrameCount;
-
-            // probe raytrace
-            {
-                uint32_t width = m_numRaysPerProbe;
-                uint32_t height = GetTotalProbeCount();
-
-                m_rayTraceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
-
-                RHI::ImageInitRequest request;
-                request.m_image = m_rayTraceImage[m_currentImageIndex].get();
-                request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::RayTraceImageFormat);
-                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
-                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeRayTraceImage image");
-            }
-
             uint32_t probeCountX;
             uint32_t probeCountY;
             GetTexture2DProbeCount(probeCountX, probeCountY);
 
-            // probe irradiance
+            if (m_mode == DiffuseProbeGridMode::RealTime)
             {
-                uint32_t width = probeCountX * (DefaultNumIrradianceTexels + 2);
-                uint32_t height = probeCountY * (DefaultNumIrradianceTexels + 2);
+                // advance to the next image in the frame image array
+                m_currentImageIndex = (m_currentImageIndex + 1) % ImageFrameCount;
 
-                m_irradianceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+                // probe raytrace
+                {
+                    uint32_t width = m_numRaysPerProbe;
+                    uint32_t height = GetTotalProbeCount();
 
-                RHI::ImageInitRequest request;
-                request.m_image = m_irradianceImage[m_currentImageIndex].get();
-                request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::IrradianceImageFormat);
-                RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0.0f, 0.0f, 0.0f, 0.0f);
-                request.m_optimizedClearValue = &clearValue;
-                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
-                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeIrradianceImage image");
+                    m_rayTraceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+
+                    RHI::ImageInitRequest request;
+                    request.m_image = m_rayTraceImage[m_currentImageIndex].get();
+                    request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead, width, height, DiffuseProbeGridRenderData::RayTraceImageFormat);
+                    [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                    AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeRayTraceImage image");
+                }
+
+                // probe irradiance
+                {
+                    uint32_t width = probeCountX * (DefaultNumIrradianceTexels + 2);
+                    uint32_t height = probeCountY * (DefaultNumIrradianceTexels + 2);
+
+                    m_irradianceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+
+                    RHI::ImageInitRequest request;
+                    request.m_image = m_irradianceImage[m_currentImageIndex].get();
+                    request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead, width, height, DiffuseProbeGridRenderData::IrradianceImageFormat);
+                    RHI::ClearValue clearValue = RHI::ClearValue::CreateVector4Float(0.0f, 0.0f, 0.0f, 0.0f);
+                    request.m_optimizedClearValue = &clearValue;
+                    [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                    AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeIrradianceImage image");
+                }
+
+                // probe distance
+                {
+                    uint32_t width = probeCountX * (DefaultNumDistanceTexels + 2);
+                    uint32_t height = probeCountY * (DefaultNumDistanceTexels + 2);
+
+                    m_distanceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+
+                    RHI::ImageInitRequest request;
+                    request.m_image = m_distanceImage[m_currentImageIndex].get();
+                    request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead, width, height, DiffuseProbeGridRenderData::DistanceImageFormat);
+                    [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                    AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeDistanceImage image");
+                }
+
+                // probe relocation
+                {
+                    uint32_t width = probeCountX;
+                    uint32_t height = probeCountY;
+
+                    m_relocationImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+
+                    RHI::ImageInitRequest request;
+                    request.m_image = m_relocationImage[m_currentImageIndex].get();
+                    request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead, width, height, DiffuseProbeGridRenderData::RelocationImageFormat);
+                    [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                    AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeRelocationImage image");
+                }
+
+                // probe classification
+                {
+                    uint32_t width = probeCountX;
+                    uint32_t height = probeCountY;
+
+                    m_classificationImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+
+                    RHI::ImageInitRequest request;
+                    request.m_image = m_classificationImage[m_currentImageIndex].get();
+                    request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead, width, height, DiffuseProbeGridRenderData::ClassificationImageFormat);
+                    [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
+                    AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeClassificationImage image");
+                }
             }
-
-            // probe distance
+            else if (m_mode == DiffuseProbeGridMode::Baked && HasValidBakedTextures())
             {
-                uint32_t width = probeCountX * (DefaultNumDistanceTexels + 2);
-                uint32_t height = probeCountY * (DefaultNumDistanceTexels + 2);
+                // copy the baked relocation and classification texture data to the RW textures
+                // (these need to be RW for shader compatibility)
+                RHI::ImageSubresourceRange range{ 0, 0, 0 ,0 };
+                RHI::ImageSubresourceLayoutPlaced layout;
 
-                m_distanceImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
+                // relocation
+                {
+                    m_bakedRelocationImage->GetSubresourceLayouts(range, &layout, nullptr);
 
-                RHI::ImageInitRequest request;
-                request.m_image = m_distanceImage[m_currentImageIndex].get();
-                request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::DistanceImageFormat);
-                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
-                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeDistanceImage image");
-            }
+                    RHI::ImageUpdateRequest updateRequest;
+                    updateRequest.m_image = m_bakedRelocationImage.get();
+                    updateRequest.m_sourceSubresourceLayout = layout;
+                    updateRequest.m_sourceData = m_bakedRelocationImageData.data();
+                    updateRequest.m_imageSubresourcePixelOffset = RHI::Origin(0, 0, 0);
+                    m_renderData->m_imagePool->UpdateImageContents(updateRequest);
+                }
 
-            // probe relocation
-            {
-                uint32_t width = probeCountX;
-                uint32_t height = probeCountY;
+                // classification
+                {
+                    m_bakedClassificationImage->GetSubresourceLayouts(range, &layout, nullptr);
 
-                m_relocationImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
-
-                RHI::ImageInitRequest request;
-                request.m_image = m_relocationImage[m_currentImageIndex].get();
-                request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::RelocationImageFormat);
-                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
-                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeRelocationImage image");
-            }
-
-            // probe classification
-            {
-                uint32_t width = probeCountX;
-                uint32_t height = probeCountY;
-
-                m_classificationImage[m_currentImageIndex] = RHI::Factory::Get().CreateImage();
-
-                RHI::ImageInitRequest request;
-                request.m_image = m_classificationImage[m_currentImageIndex].get();
-                request.m_descriptor = RHI::ImageDescriptor::Create2D(RHI::ImageBindFlags::ShaderReadWrite, width, height, DiffuseProbeGridRenderData::ClassificationImageFormat);
-                [[maybe_unused]] RHI::ResultCode result = m_renderData->m_imagePool->InitImage(request);
-                AZ_Assert(result == RHI::ResultCode::Success, "Failed to initialize m_probeClassificationImage image");
+                    RHI::ImageUpdateRequest updateRequest;
+                    updateRequest.m_image = m_bakedClassificationImage.get();
+                    updateRequest.m_sourceSubresourceLayout = layout;
+                    updateRequest.m_sourceData = m_bakedClassificationImageData.data();
+                    updateRequest.m_imageSubresourcePixelOffset = RHI::Origin(0, 0, 0);
+                    m_renderData->m_imagePool->UpdateImageContents(updateRequest);
+                }
             }
 
             m_updateTextures = false;
@@ -639,16 +757,16 @@ namespace AZ
             m_renderObjectSrg->SetConstant(constantIndex, m_ambientMultiplier);
 
             imageIndex = srgLayout->FindShaderInputImageIndex(Name("m_probeIrradiance"));
-            m_renderObjectSrg->SetImageView(imageIndex, m_irradianceImage[m_currentImageIndex]->GetImageView(m_renderData->m_probeIrradianceImageViewDescriptor).get());
+            m_renderObjectSrg->SetImageView(imageIndex, GetIrradianceImage()->GetImageView(m_renderData->m_probeIrradianceImageViewDescriptor).get());
 
             imageIndex = srgLayout->FindShaderInputImageIndex(Name("m_probeDistance"));
-            m_renderObjectSrg->SetImageView(imageIndex, m_distanceImage[m_currentImageIndex]->GetImageView(m_renderData->m_probeDistanceImageViewDescriptor).get());
+            m_renderObjectSrg->SetImageView(imageIndex, GetDistanceImage()->GetImageView(m_renderData->m_probeDistanceImageViewDescriptor).get());
 
             imageIndex = srgLayout->FindShaderInputImageIndex(Name("m_probeOffsets"));
-            m_renderObjectSrg->SetImageView(imageIndex, m_relocationImage[m_currentImageIndex]->GetImageView(m_renderData->m_probeRelocationImageViewDescriptor).get());
+            m_renderObjectSrg->SetImageView(imageIndex, GetRelocationImage()->GetImageView(m_renderData->m_probeRelocationImageViewDescriptor).get());
 
             imageIndex = srgLayout->FindShaderInputImageIndex(Name("m_probeStates"));
-            m_renderObjectSrg->SetImageView(imageIndex, m_classificationImage[m_currentImageIndex]->GetImageView(m_renderData->m_probeClassificationImageViewDescriptor).get());
+            m_renderObjectSrg->SetImageView(imageIndex, GetClassificationImage()->GetImageView(m_renderData->m_probeClassificationImageViewDescriptor).get());
 
             SetGridConstants(m_renderObjectSrg);
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
index e1ca2123a5..ff6ad719cf 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGrid.h
@@ -17,6 +17,7 @@
 #include <Atom/RPI.Public/Scene.h>
 #include <AzCore/Math/Random.h>
 #include <AzCore/Math/Aabb.h>
+#include <DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h>
 
 namespace AZ
 {
@@ -26,11 +27,12 @@ namespace AZ
 
         struct DiffuseProbeGridRenderData
         {
+            // [GFX TODO][ATOM-15650] Change DiffuseProbeGrid Classification texture to R8_UINT
             static const RHI::Format RayTraceImageFormat = RHI::Format::R32G32B32A32_FLOAT;
             static const RHI::Format IrradianceImageFormat = RHI::Format::R16G16B16A16_UNORM;
             static const RHI::Format DistanceImageFormat = RHI::Format::R32G32_FLOAT;
             static const RHI::Format RelocationImageFormat = RHI::Format::R16G16B16A16_FLOAT;
-            static const RHI::Format ClassificationImageFormat = RHI::Format::R8_UINT;
+            static const RHI::Format ClassificationImageFormat = RHI::Format::R32_FLOAT;
 
             // image pool
             RHI::Ptr<RHI::ImagePool> m_imagePool;
@@ -61,7 +63,7 @@ namespace AZ
         class DiffuseProbeGrid final
         {
         public:
-            DiffuseProbeGrid() = default;
+            DiffuseProbeGrid();
             ~DiffuseProbeGrid();
 
             void Init(RPI::Scene* scene, DiffuseProbeGridRenderData* diffuseProbeGridRenderData);
@@ -96,6 +98,9 @@ namespace AZ
             bool GetUseDiffuseIbl() const { return m_useDiffuseIbl; }
             void SetUseDiffuseIbl(bool useDiffuseIbl) { m_useDiffuseIbl = useDiffuseIbl; }
 
+            DiffuseProbeGridMode GetMode() const { return m_mode; }
+            void SetMode(DiffuseProbeGridMode mode);
+
             uint32_t GetNumRaysPerProbe() const { return m_numRaysPerProbe; }
 
             uint32_t GetRemainingRelocationIterations() const { return aznumeric_cast<uint32_t>(m_remainingRelocationIterations); }
@@ -133,11 +138,16 @@ namespace AZ
             void UpdateRenderObjectSrg();
 
             // textures
-            const RHI::Ptr<RHI::Image>& GetRayTraceImage() { return m_rayTraceImage[m_currentImageIndex]; }
-            const RHI::Ptr<RHI::Image>& GetIrradianceImage() { return m_irradianceImage[m_currentImageIndex]; }
-            const RHI::Ptr<RHI::Image>& GetDistanceImage() { return m_distanceImage[m_currentImageIndex]; }
-            const RHI::Ptr<RHI::Image>& GetRelocationImage() { return m_relocationImage[m_currentImageIndex]; }
-            const RHI::Ptr<RHI::Image>& GetClassificationImage() { return m_classificationImage[m_currentImageIndex]; }
+            const RHI::Ptr<RHI::Image> GetRayTraceImage() { return m_rayTraceImage[m_currentImageIndex]; }
+            const RHI::Ptr<RHI::Image> GetIrradianceImage() { return m_mode == DiffuseProbeGridMode::RealTime ? m_irradianceImage[m_currentImageIndex] : m_bakedIrradianceImage->GetRHIImage(); }
+            const RHI::Ptr<RHI::Image> GetDistanceImage() { return m_mode == DiffuseProbeGridMode::RealTime ? m_distanceImage[m_currentImageIndex] : m_bakedDistanceImage->GetRHIImage(); }
+            const RHI::Ptr<RHI::Image> GetRelocationImage() { return m_mode == DiffuseProbeGridMode::RealTime ? m_relocationImage[m_currentImageIndex] : m_bakedRelocationImage; }
+            const RHI::Ptr<RHI::Image> GetClassificationImage() { return m_mode == DiffuseProbeGridMode::RealTime ? m_classificationImage[m_currentImageIndex] : m_bakedClassificationImage; }
+
+            const AZStd::string& GetBakedIrradianceRelativePath() const { return m_bakedIrradianceRelativePath; }
+            const AZStd::string& GetBakedDistanceRelativePath() const { return m_bakedDistanceRelativePath; }
+            const AZStd::string& GetBakedRelocationRelativePath() const { return m_bakedRelocationRelativePath; }
+            const AZStd::string& GetBakedClassificationRelativePath() const { return m_bakedClassificationRelativePath; }
 
             // attachment Ids
             const RHI::AttachmentId GetRayTraceImageAttachmentId() const { return m_rayTraceImageAttachmentId; }
@@ -152,6 +162,12 @@ namespace AZ
             bool GetIrradianceClearRequired() const { return m_irradianceClearRequired; }
             void ResetIrradianceClearRequired() { m_irradianceClearRequired = false; }
 
+            // texture readback
+            DiffuseProbeGridTextureReadback& GetTextureReadback() { return m_textureReadback; }
+
+            void SetBakedTextures(const DiffuseProbeGridBakedTextures& bakedTextures);
+            bool HasValidBakedTextures() const;
+
             static constexpr uint32_t DefaultNumIrradianceTexels = 6;
             static constexpr uint32_t DefaultNumDistanceTexels = 14;
             static constexpr int32_t DefaultNumRelocationIterations = 100;
@@ -221,7 +237,10 @@ namespace AZ
             // culling
             RPI::Cullable m_cullable;
 
-            // textures
+            // grid mode (RealTime or Baked)
+            DiffuseProbeGridMode m_mode = DiffuseProbeGridMode::RealTime;
+
+            // real-time textures
             static const uint32_t MaxTextureDimension = 8192;
             static const uint32_t ImageFrameCount = 3;
             RHI::Ptr<RHI::Image> m_rayTraceImage[ImageFrameCount];
@@ -233,6 +252,25 @@ namespace AZ
             bool m_updateTextures = false;
             bool m_irradianceClearRequired = true;
 
+            // baked textures
+            Data::Instance<RPI::Image> m_bakedIrradianceImage;
+            Data::Instance<RPI::Image> m_bakedDistanceImage;
+            RHI::Ptr<RHI::Image> m_bakedRelocationImage;
+            RHI::Ptr<RHI::Image> m_bakedClassificationImage;
+
+            // baked texture relative paths
+            AZStd::string m_bakedIrradianceRelativePath;
+            AZStd::string m_bakedDistanceRelativePath;
+            AZStd::string m_bakedRelocationRelativePath;
+            AZStd::string m_bakedClassificationRelativePath;
+
+            // baked texture data (only needed for the relocation and classification textures)
+            AZStd::vector<uint8_t> m_bakedRelocationImageData;
+            AZStd::vector<uint8_t> m_bakedClassificationImageData;
+
+            // texture readback
+            DiffuseProbeGridTextureReadback m_textureReadback;
+
             // Srgs
             Data::Instance<RPI::ShaderResourceGroup> m_rayTraceSrg;
             Data::Instance<RPI::ShaderResourceGroup> m_blendIrradianceSrg;
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendDistancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendDistancePass.cpp
index 3df13556d3..2a06dacf3f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendDistancePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendDistancePass.cpp
@@ -87,7 +87,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -111,7 +111,7 @@ namespace AZ
 
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // probe raytrace image
                 {
@@ -150,7 +150,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -167,7 +167,7 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
             // submit the DispatchItem for each DiffuseProbeGrid
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetBlendDistanceSrg()->GetRHIShaderResourceGroup();
                 commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup);
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendIrradiancePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendIrradiancePass.cpp
index 4e05b8ef31..4818018ea3 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendIrradiancePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBlendIrradiancePass.cpp
@@ -87,7 +87,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -111,7 +111,7 @@ namespace AZ
 
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // probe raytrace image
                 {
@@ -150,7 +150,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -167,7 +167,7 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
             // submit the DispatchItem for each DiffuseProbeGrid
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetBlendIrradianceSrg()->GetRHIShaderResourceGroup();
                 commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup);
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBorderUpdatePass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBorderUpdatePass.cpp
index 59549de331..8821de8a9d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBorderUpdatePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridBorderUpdatePass.cpp
@@ -100,7 +100,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -124,7 +124,7 @@ namespace AZ
 
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // probe irradiance image
                 {
@@ -153,7 +153,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see line ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -173,7 +173,7 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
             // submit the DispatchItems for each DiffuseProbeGrid
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 uint32_t probeCountX;
                 uint32_t probeCountY;
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridClassificationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridClassificationPass.cpp
index db85914cee..65f1c2dd5a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridClassificationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridClassificationPass.cpp
@@ -91,7 +91,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -115,7 +115,7 @@ namespace AZ
 
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // probe raytrace image
                 {
@@ -143,7 +143,7 @@ namespace AZ
         {
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -159,7 +159,7 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
             // submit the DispatchItems for each DiffuseProbeGrid
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetClassificationSrg()->GetRHIShaderResourceGroup();
                 commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup);
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
index 1aaa06c797..060d51d1d0 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
@@ -45,6 +45,7 @@ namespace AZ
             RHI::RHISystemInterface* rhiSystem = RHI::RHISystemInterface::Get();
 
             m_diffuseProbeGrids.reserve(InitialProbeGridAllocationSize);
+            m_realTimeDiffuseProbeGrids.reserve(InitialProbeGridAllocationSize);
 
             RHI::BufferPoolDescriptor desc;
             desc.m_heapMemoryLevel = RHI::HeapMemoryLevel::Device;
@@ -61,7 +62,7 @@ namespace AZ
             // image pool
             {
                 RHI::ImagePoolDescriptor imagePoolDesc;
-                imagePoolDesc.m_bindFlags = RHI::ImageBindFlags::ShaderReadWrite;
+                imagePoolDesc.m_bindFlags = RHI::ImageBindFlags::ShaderReadWrite | RHI::ImageBindFlags::CopyRead;
 
                 m_probeGridRenderData.m_imagePool = RHI::Factory::Get().CreateImagePool();
                 [[maybe_unused]] RHI::ResultCode result = m_probeGridRenderData.m_imagePool->Init(*rhiSystem->GetDevice(), imagePoolDesc);
@@ -123,6 +124,32 @@ namespace AZ
                 m_needUpdatePipelineStates = false;
             }
 
+            // check pending textures and connect bus for notifications
+            for (auto& notificationEntry : m_notifyTextureAssets)
+            {
+                if (notificationEntry.m_assetId.IsValid())
+                {
+                    // asset already has an assetId
+                    continue;
+                }
+
+                // query for the assetId
+                AZ::Data::AssetId assetId;
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                    assetId,
+                    &AZ::Data::AssetCatalogRequests::GetAssetIdByPath,
+                    notificationEntry.m_relativePath.c_str(),
+                    azrtti_typeid<AZ::RPI::StreamingImageAsset>(),
+                    false);
+
+                if (assetId.IsValid())
+                {
+                    notificationEntry.m_assetId = assetId;
+                    notificationEntry.m_asset.Create(assetId, true);
+                    Data::AssetBus::MultiHandler::BusConnect(assetId);
+                }
+            }
+
             // if the volumes changed we need to re-sort the probe list
             if (m_probeGridSortRequired)
             {
@@ -139,6 +166,7 @@ namespace AZ
                 };
 
                 AZStd::sort(m_diffuseProbeGrids.begin(), m_diffuseProbeGrids.end(), sortFn);
+                AZStd::sort(m_realTimeDiffuseProbeGrids.begin(), m_realTimeDiffuseProbeGrids.end(), sortFn);
                 m_probeGridSortRequired = false;
             }
 
@@ -160,6 +188,9 @@ namespace AZ
             diffuseProbeGrid->SetExtents(extents);
             diffuseProbeGrid->SetProbeSpacing(probeSpacing);
             m_diffuseProbeGrids.push_back(diffuseProbeGrid);
+
+            UpdateRealTimeList(diffuseProbeGrid);
+
             m_probeGridSortRequired = true;
 
             return diffuseProbeGrid;
@@ -169,6 +200,7 @@ namespace AZ
         {
             AZ_Assert(probeGrid.get(), "RemoveProbeGrid called with an invalid handle");
 
+            // remove from main list
             auto itEntry = AZStd::find_if(m_diffuseProbeGrids.begin(), m_diffuseProbeGrids.end(), [&](AZStd::shared_ptr<DiffuseProbeGrid> const& entry)
             {
                 return (entry == probeGrid);
@@ -176,6 +208,18 @@ namespace AZ
 
             AZ_Assert(itEntry != m_diffuseProbeGrids.end(), "RemoveProbeGrid called with a probe grid that is not in the probe list");
             m_diffuseProbeGrids.erase(itEntry);
+
+            // remove from side list of real-time grids
+            itEntry = AZStd::find_if(m_realTimeDiffuseProbeGrids.begin(), m_realTimeDiffuseProbeGrids.end(), [&](AZStd::shared_ptr<DiffuseProbeGrid> const& entry)
+            {
+                return (entry == probeGrid);
+            });
+
+            if (itEntry != m_realTimeDiffuseProbeGrids.end())
+            {
+                m_realTimeDiffuseProbeGrids.erase(itEntry);
+            }
+
             probeGrid = nullptr;
         }
 
@@ -247,6 +291,134 @@ namespace AZ
             probeGrid->SetUseDiffuseIbl(useDiffuseIbl);
         }
 
+        void DiffuseProbeGridFeatureProcessor::BakeTextures(
+            const DiffuseProbeGridHandle& probeGrid,
+            DiffuseProbeGridBakeTexturesCallback callback,
+            const AZStd::string& irradianceTextureRelativePath,
+            const AZStd::string& distanceTextureRelativePath,
+            const AZStd::string& relocationTextureRelativePath,
+            const AZStd::string& classificationTextureRelativePath)
+        {
+            AZ_Assert(probeGrid.get(), "BakeTextures called with an invalid handle");
+
+            AddNotificationEntry(irradianceTextureRelativePath);
+            AddNotificationEntry(distanceTextureRelativePath);
+            AddNotificationEntry(relocationTextureRelativePath);
+            AddNotificationEntry(classificationTextureRelativePath);
+
+            probeGrid->GetTextureReadback().BeginTextureReadback(callback);
+        }
+
+        void DiffuseProbeGridFeatureProcessor::UpdateRealTimeList(const DiffuseProbeGridHandle& diffuseProbeGrid)
+        {
+            if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::RealTime)
+            {
+                // add to side list of real-time grids
+                auto itEntry = AZStd::find_if(m_realTimeDiffuseProbeGrids.begin(), m_realTimeDiffuseProbeGrids.end(), [&](AZStd::shared_ptr<DiffuseProbeGrid> const& entry)
+                {
+                    return (entry == diffuseProbeGrid);
+                });
+
+                if (itEntry == m_realTimeDiffuseProbeGrids.end())
+                {
+                    m_realTimeDiffuseProbeGrids.push_back(diffuseProbeGrid);
+                }
+            }
+            else
+            {
+                // remove from side list of real-time grids
+                auto itEntry = AZStd::find_if(m_realTimeDiffuseProbeGrids.begin(), m_realTimeDiffuseProbeGrids.end(), [&](AZStd::shared_ptr<DiffuseProbeGrid> const& entry)
+                {
+                    return (entry == diffuseProbeGrid);
+                });
+
+                if (itEntry != m_realTimeDiffuseProbeGrids.end())
+                {
+                    m_realTimeDiffuseProbeGrids.erase(itEntry);
+                }
+            }
+        }
+
+        void DiffuseProbeGridFeatureProcessor::AddNotificationEntry(const AZStd::string& relativePath)
+        {
+            AZStd::string assetPath = relativePath + ".streamingimage";
+
+            // check to see if this is an existing asset
+            AZ::Data::AssetId assetId;
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(
+                assetId,
+                &AZ::Data::AssetCatalogRequests::GetAssetIdByPath,
+                assetPath.c_str(),
+                azrtti_typeid<AZ::RPI::StreamingImageAsset>(),
+                false);
+
+            // We only track notifications for new texture assets, meaning assets that are created the first time a DiffuseProbeGrid is baked.
+            // On subsequent bakes the existing assets are automatically reloaded by the RPI since they are already known by the asset system.
+            if (!assetId.IsValid())
+            {
+                m_notifyTextureAssets.push_back({ assetPath, assetId });
+            }
+        }
+
+        bool DiffuseProbeGridFeatureProcessor::CheckTextureAssetNotification(
+            const AZStd::string& relativePath,
+            Data::Asset<RPI::StreamingImageAsset>& outTextureAsset,
+            DiffuseProbeGridTextureNotificationType& outNotificationType)
+        {
+            for (NotifyTextureAssetVector::iterator itNotification = m_notifyTextureAssets.begin(); itNotification != m_notifyTextureAssets.end(); ++itNotification)
+            {
+                if (itNotification->m_relativePath == relativePath)
+                {
+                    outNotificationType = itNotification->m_notificationType;
+                    if (outNotificationType != DiffuseProbeGridTextureNotificationType::None)
+                    {
+                        outTextureAsset = itNotification->m_asset;
+                        m_notifyTextureAssets.erase(itNotification);
+                    }
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool DiffuseProbeGridFeatureProcessor::AreBakedTexturesReferenced(
+            const AZStd::string& irradianceTextureRelativePath,
+            const AZStd::string& distanceTextureRelativePath,
+            const AZStd::string& relocationTextureRelativePath,
+            const AZStd::string& classificationTextureRelativePath)
+        {
+            for (auto& diffuseProbeGrid : m_diffuseProbeGrids)
+            {
+                if ((diffuseProbeGrid->GetBakedIrradianceRelativePath() == irradianceTextureRelativePath) ||
+                    (diffuseProbeGrid->GetBakedDistanceRelativePath() == distanceTextureRelativePath) ||
+                    (diffuseProbeGrid->GetBakedRelocationRelativePath() == relocationTextureRelativePath) ||
+                    (diffuseProbeGrid->GetBakedClassificationRelativePath() == classificationTextureRelativePath))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        void DiffuseProbeGridFeatureProcessor::SetMode(const DiffuseProbeGridHandle& probeGrid, DiffuseProbeGridMode mode)
+        {
+            AZ_Assert(probeGrid.get(), "SetMode called with an invalid handle");
+            probeGrid->SetMode(mode);
+
+            UpdateRealTimeList(probeGrid);
+
+            m_probeGridSortRequired = true;
+        }
+
+        void DiffuseProbeGridFeatureProcessor::SetBakedTextures(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridBakedTextures& bakedTextures)
+        {
+            AZ_Assert(probeGrid.get(), "SetBakedTextures called with an invalid handle");
+            probeGrid->SetBakedTextures(bakedTextures);
+        }
+
         void DiffuseProbeGridFeatureProcessor::CreateBoxMesh()
         {
             // vertex positions
@@ -418,5 +590,34 @@ namespace AZ
             }
         }
 
+        void DiffuseProbeGridFeatureProcessor::HandleAssetNotification(Data::Asset<Data::AssetData> asset, DiffuseProbeGridTextureNotificationType notificationType)
+        {
+            for (NotifyTextureAssetVector::iterator itNotification = m_notifyTextureAssets.begin(); itNotification != m_notifyTextureAssets.end(); ++itNotification)
+            {
+                if (itNotification->m_assetId == asset.GetId())
+                {
+                    // store the texture asset
+                    itNotification->m_asset = Data::static_pointer_cast<RPI::StreamingImageAsset>(asset);
+                    itNotification->m_notificationType = notificationType;
+
+                    // stop notifications on this asset
+                    Data::AssetBus::MultiHandler::BusDisconnect(itNotification->m_assetId);
+
+                    break;
+                }
+            }
+        }
+
+        void DiffuseProbeGridFeatureProcessor::OnAssetReady(Data::Asset<Data::AssetData> asset)
+        {
+            HandleAssetNotification(asset, DiffuseProbeGridTextureNotificationType::Ready);
+        }
+
+        void DiffuseProbeGridFeatureProcessor::OnAssetError(Data::Asset<Data::AssetData> asset)
+        {
+            AZ_Error("ReflectionProbeFeatureProcessor", false, "Failed to load cubemap [%s]", asset.GetHint().c_str());
+
+            HandleAssetNotification(asset, DiffuseProbeGridTextureNotificationType::Error);
+        }
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.h
index ad36f8aafa..19e9bf1b1d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.h
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.h
@@ -22,6 +22,7 @@ namespace AZ
         //! This class manages DiffuseProbeGrids which generate diffuse global illumination
         class DiffuseProbeGridFeatureProcessor final
             : public DiffuseProbeGridFeatureProcessorInterface
+            , private Data::AssetBus::MultiHandler
         {
         public:
             AZ_RTTI(AZ::Render::DiffuseProbeGridFeatureProcessor, "{BCD232F9-1EBF-4D0D-A5F4-84AEC933A93C}", DiffuseProbeGridFeatureProcessorInterface);
@@ -46,6 +47,27 @@ namespace AZ
             void Enable(const DiffuseProbeGridHandle& probeGrid, bool enable) override;
             void SetGIShadows(const DiffuseProbeGridHandle& probeGrid, bool giShadows) override;
             void SetUseDiffuseIbl(const DiffuseProbeGridHandle& probeGrid, bool useDiffuseIbl) override;
+            void SetMode(const DiffuseProbeGridHandle& probeGrid, DiffuseProbeGridMode mode) override;
+            void SetBakedTextures(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridBakedTextures& bakedTextures) override;
+
+            void BakeTextures(
+                const DiffuseProbeGridHandle& probeGrid,
+                DiffuseProbeGridBakeTexturesCallback callback,
+                const AZStd::string& irradianceTextureRelativePath,
+                const AZStd::string& distanceTextureRelativePath,
+                const AZStd::string& relocationTextureRelativePath,
+                const AZStd::string& classificationTextureRelativePath) override;
+
+            bool CheckTextureAssetNotification(
+                const AZStd::string& relativePath,
+                Data::Asset<RPI::StreamingImageAsset>& outTextureAsset,
+                DiffuseProbeGridTextureNotificationType& outNotificationType) override;
+
+            bool AreBakedTexturesReferenced(
+                const AZStd::string& irradianceTextureRelativePath,
+                const AZStd::string& distanceTextureRelativePath,
+                const AZStd::string& relocationTextureRelativePath,
+                const AZStd::string& classificationTextureRelativePath) override;
 
             // FeatureProcessor overrides
             void Activate() override;
@@ -56,12 +78,28 @@ namespace AZ
             using DiffuseProbeGridVector = AZStd::vector<AZStd::shared_ptr<DiffuseProbeGrid>>;
             DiffuseProbeGridVector& GetProbeGrids() { return m_diffuseProbeGrids; }
 
+            // retrieve the side list of probe grids that are using real-time (raytraced) mode
+            DiffuseProbeGridVector& GetRealTimeProbeGrids() { return m_realTimeDiffuseProbeGrids; }
+
         private:
             AZ_DISABLE_COPY_MOVE(DiffuseProbeGridFeatureProcessor);
 
             // create the box vertex and index streams, which are used to render the probe volumes
             void CreateBoxMesh();
 
+            // AssetBus::MultiHandler overrides...
+            void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
+            void OnAssetError(Data::Asset<Data::AssetData> asset) override;
+
+            // updates the real-time list for a specific probe grid
+            void UpdateRealTimeList(const DiffuseProbeGridHandle& diffuseProbeGrid);
+
+            // adds a notification entry for a new asset
+            void AddNotificationEntry(const AZStd::string& relativePath);
+
+            // notifies and removes the notification entry
+            void HandleAssetNotification(Data::Asset<Data::AssetData> asset, DiffuseProbeGridTextureNotificationType notificationType);
+
             // RPI::SceneNotificationBus::Handler overrides
             void OnRenderPipelinePassesChanged(RPI::RenderPipeline* renderPipeline) override;
             void OnRenderPipelineAdded(RPI::RenderPipelinePtr pipeline) override;
@@ -70,10 +108,13 @@ namespace AZ
             void UpdatePipelineStates();
             void UpdatePasses();
 
-            // list of diffuse probe grids
+            // list of all diffuse probe grids
             const size_t InitialProbeGridAllocationSize = 64;
             DiffuseProbeGridVector m_diffuseProbeGrids;
 
+            // side list of diffuse probe grids that are in real-time mode (subset of m_diffuseProbeGrids)
+            DiffuseProbeGridVector m_realTimeDiffuseProbeGrids;
+
             // position structure for the box vertices
             struct Position
             {
@@ -102,6 +143,17 @@ namespace AZ
 
             // indicates the the diffuse probe grid render pipeline state needs to be updated
             bool m_needUpdatePipelineStates = false;
+
+            // list of texture assets that we need to check during Simulate() to see if they are ready
+            struct NotifyTextureAssetEntry
+            {
+                AZStd::string m_relativePath;
+                AZ::Data::AssetId m_assetId;
+                Data::Asset<RPI::StreamingImageAsset> m_asset;
+                DiffuseProbeGridTextureNotificationType m_notificationType = DiffuseProbeGridTextureNotificationType::None;
+            };
+            typedef AZStd::vector<NotifyTextureAssetEntry> NotifyTextureAssetVector;
+            NotifyTextureAssetVector m_notifyTextureAssets;
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
index b2b5f60660..65d71b8272 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRayTracingPass.cpp
@@ -136,7 +136,7 @@ namespace AZ
             }
 
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -153,9 +153,9 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
             RayTracingFeatureProcessor* rayTracingFeatureProcessor = scene->GetFeatureProcessor<RayTracingFeatureProcessor>();
 
-            frameGraph.SetEstimatedItemCount(aznumeric_cast<uint32_t>(diffuseProbeGridFeatureProcessor->GetProbeGrids().size()));
+            frameGraph.SetEstimatedItemCount(aznumeric_cast<uint32_t>(diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().size()));
 
-            for (const auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (const auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // TLAS
                 {
@@ -260,7 +260,7 @@ namespace AZ
                 rayTracingFeatureProcessor->GetMeshInfoBuffer() &&
                 rayTracingFeatureProcessor->GetSubMeshCount())
             {
-                for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+                for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
                 {
                     // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader
                     // inputs (see line ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -308,7 +308,7 @@ namespace AZ
                 m_rayTracingShaderTable)
             {
                 // submit the DispatchRaysItem for each DiffuseProbeGrid
-                for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+                for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
                 {
                     const RHI::ShaderResourceGroup* shaderResourceGroups[] = {
                         diffuseProbeGrid->GetRayTraceSrg()->GetRHIShaderResourceGroup(),
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRelocationPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRelocationPass.cpp
index 2bd6595b71..86a26f002d 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRelocationPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRelocationPass.cpp
@@ -91,7 +91,7 @@ namespace AZ
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
-            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetProbeGrids().empty())
+            if (!diffuseProbeGridFeatureProcessor || diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids().empty())
             {
                 // no diffuse probe grids
                 return;
@@ -108,7 +108,7 @@ namespace AZ
 
             // create the Relocation Srgs for each DiffuseProbeGrid, and check to see if any grids need relocation
             bool needRelocation = false;
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 uint32_t rayTracingDataRevision = rayTracingFeatureProcessor->GetRevision();
                 if (rayTracingDataRevision != m_rayTracingDataRevision)
@@ -139,7 +139,7 @@ namespace AZ
 
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // probe raytrace image
                 {
@@ -167,7 +167,7 @@ namespace AZ
         {
             RPI::Scene* scene = m_pipeline->GetScene();
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see ValidateSetImageView() in ShaderResourceGroupData.cpp)
@@ -187,7 +187,7 @@ namespace AZ
             DiffuseProbeGridFeatureProcessor* diffuseProbeGridFeatureProcessor = scene->GetFeatureProcessor<DiffuseProbeGridFeatureProcessor>();
 
             // submit the DispatchItems for each DiffuseProbeGrid
-            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
             {
                 const RHI::ShaderResourceGroup* shaderResourceGroup = diffuseProbeGrid->GetRelocationSrg()->GetRHIShaderResourceGroup();
                 commandList->SetShaderResourceGroupForDispatch(*shaderResourceGroup);
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRenderPass.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRenderPass.cpp
index af6fce6f6a..4f9221a65f 100644
--- a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRenderPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridRenderPass.cpp
@@ -79,6 +79,12 @@ namespace AZ
             params.m_scissorState = scissor;
 
             Base::FrameBeginInternal(params);
+
+            for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetRealTimeProbeGrids())
+            {
+                // process attachment readback
+                diffuseProbeGrid->GetTextureReadback().FrameBegin(params);
+            }
         }
 
         void DiffuseProbeGridRenderPass::SetupFrameGraphDependencies(RHI::FrameGraphInterface frameGraph)
@@ -88,8 +94,21 @@ namespace AZ
 
             for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
             {
+                if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked &&
+                    !diffuseProbeGrid->HasValidBakedTextures())
+                {
+                    continue;
+                }
+                    
                 // probe irradiance image
                 {
+                    if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked)
+                    {
+                        // import the irradiance image now, since it is baked and therefore was not imported during the raytracing pass
+                        [[maybe_unused]] RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetIrradianceImageAttachmentId(), diffuseProbeGrid->GetIrradianceImage());
+                        AZ_Assert(result == RHI::ResultCode::Success, "Failed to import probeIrradianceImage");
+                    }
+
                     RHI::ImageScopeAttachmentDescriptor desc;
                     desc.m_attachmentId = diffuseProbeGrid->GetIrradianceImageAttachmentId();
                     desc.m_imageViewDescriptor = diffuseProbeGrid->GetRenderData()->m_probeIrradianceImageViewDescriptor;
@@ -100,6 +119,13 @@ namespace AZ
 
                 // probe distance image
                 {
+                    if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked)
+                    {
+                        // import the distance image now, since it is baked and therefore was not imported during the raytracing pass
+                        [[maybe_unused]] RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetDistanceImageAttachmentId(), diffuseProbeGrid->GetDistanceImage());
+                        AZ_Assert(result == RHI::ResultCode::Success, "Failed to import probeDistanceImage");
+                    }
+
                     RHI::ImageScopeAttachmentDescriptor desc;
                     desc.m_attachmentId = diffuseProbeGrid->GetDistanceImageAttachmentId();
                     desc.m_imageViewDescriptor = diffuseProbeGrid->GetRenderData()->m_probeDistanceImageViewDescriptor;
@@ -110,6 +136,13 @@ namespace AZ
 
                 // probe relocation image
                 {
+                    if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked)
+                    {
+                        // import the relocation image now, since it is baked and therefore was not imported during the raytracing pass
+                        [[maybe_unused]] RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetRelocationImageAttachmentId(), diffuseProbeGrid->GetRelocationImage());
+                        AZ_Assert(result == RHI::ResultCode::Success, "Failed to import probeRelocationImage");
+                    }
+
                     RHI::ImageScopeAttachmentDescriptor desc;
                     desc.m_attachmentId = diffuseProbeGrid->GetRelocationImageAttachmentId();
                     desc.m_imageViewDescriptor = diffuseProbeGrid->GetRenderData()->m_probeRelocationImageViewDescriptor;
@@ -120,6 +153,13 @@ namespace AZ
 
                 // probe classification image
                 {
+                    if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked)
+                    {
+                        // import the classification image now, since it is baked and therefore was not imported during the raytracing pass
+                        [[maybe_unused]] RHI::ResultCode result = frameGraph.GetAttachmentDatabase().ImportImage(diffuseProbeGrid->GetClassificationImageAttachmentId(), diffuseProbeGrid->GetClassificationImage());
+                        AZ_Assert(result == RHI::ResultCode::Success, "Failed to import probeClassificationImage");
+                    }
+
                     RHI::ImageScopeAttachmentDescriptor desc;
                     desc.m_attachmentId = diffuseProbeGrid->GetClassificationImageAttachmentId();
                     desc.m_imageViewDescriptor = diffuseProbeGrid->GetRenderData()->m_probeClassificationImageViewDescriptor;
@@ -127,6 +167,8 @@ namespace AZ
 
                     frameGraph.UseShaderAttachment(desc, RHI::ScopeAttachmentAccess::ReadWrite);
                 }
+
+                diffuseProbeGrid->GetTextureReadback().Update(GetName());
             }
 
             Base::SetupFrameGraphDependencies(frameGraph);
@@ -139,6 +181,12 @@ namespace AZ
 
             for (auto& diffuseProbeGrid : diffuseProbeGridFeatureProcessor->GetProbeGrids())
             {
+                if (diffuseProbeGrid->GetMode() == DiffuseProbeGridMode::Baked &&
+                    !diffuseProbeGrid->HasValidBakedTextures())
+                {
+                    continue;
+                }
+
                 // the diffuse probe grid Srg must be updated in the Compile phase in order to successfully bind the ReadWrite shader inputs
                 // (see ValidateSetImageView() of ShaderResourceGroupData.cpp)
                 diffuseProbeGrid->UpdateRenderObjectSrg();
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.cpp b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.cpp
new file mode 100644
index 0000000000..bc619cc277
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.cpp
@@ -0,0 +1,134 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h>
+#include <DiffuseProbeGrid/DiffuseProbeGrid.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        DiffuseProbeGridTextureReadback::DiffuseProbeGridTextureReadback(DiffuseProbeGrid* diffuseProbeGrid)
+            : m_diffuseProbeGrid(diffuseProbeGrid)
+        {
+        }
+
+        void DiffuseProbeGridTextureReadback::BeginTextureReadback(DiffuseProbeGridBakeTexturesCallback callback)
+        {
+            AZ_Assert(m_readbackState == DiffuseProbeGridReadbackState::Idle, "DiffuseProbeGridTextureReadback is already processing a readback request");
+
+            m_callback = callback;
+            m_readbackState = DiffuseProbeGridReadbackState::Irradiance;
+        }
+
+        void DiffuseProbeGridTextureReadback::Update(const AZ::Name& passName)
+        {
+            if (m_readbackState == DiffuseProbeGridReadbackState::Idle || m_readbackState == DiffuseProbeGridReadbackState::Complete)
+            {
+                return;
+            }
+
+            if (m_attachmentReadback.get() && m_attachmentReadback->GetReadbackState() > RPI::AttachmentReadback::ReadbackState::Idle)
+            {
+                // still processing previous request
+                return;
+            }
+
+            AZStd::string readbackName = AZStd::string::format("DiffuseProbeGridReadback_%s", passName.GetCStr());
+            RHI::ImageDescriptor descriptor;
+            RHI::AttachmentId attachmentId;
+            RPI::AttachmentReadback::CallbackFunction callbackFunction;
+
+            switch (m_readbackState)
+            {
+            case DiffuseProbeGridReadbackState::Irradiance:
+                descriptor = m_diffuseProbeGrid->GetIrradianceImage()->GetDescriptor();
+                attachmentId = m_diffuseProbeGrid->GetIrradianceImageAttachmentId();
+                callbackFunction = [this](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
+                {
+                    m_irradianceReadbackResult = readbackResult;
+                    m_readbackState = DiffuseProbeGridReadbackState::Distance;
+                };
+                break;
+            case DiffuseProbeGridReadbackState::Distance:
+                descriptor = m_diffuseProbeGrid->GetDistanceImage()->GetDescriptor();
+                attachmentId = m_diffuseProbeGrid->GetDistanceImageAttachmentId();
+                callbackFunction = [this](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
+                {
+                    m_distanceReadbackResult = readbackResult;
+                    m_readbackState = DiffuseProbeGridReadbackState::Relocation;
+                };
+                break;
+            case DiffuseProbeGridReadbackState::Relocation:
+                descriptor = m_diffuseProbeGrid->GetRelocationImage()->GetDescriptor();
+                attachmentId = m_diffuseProbeGrid->GetRelocationImageAttachmentId();
+                callbackFunction = [this](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
+                {
+                    m_relocationReadbackResult = readbackResult;
+                    m_readbackState = DiffuseProbeGridReadbackState::Classification;
+                };
+                break;
+            case DiffuseProbeGridReadbackState::Classification:
+                descriptor = m_diffuseProbeGrid->GetClassificationImage()->GetDescriptor();
+                attachmentId = m_diffuseProbeGrid->GetClassificationImageAttachmentId();
+                callbackFunction = [this](const AZ::RPI::AttachmentReadback::ReadbackResult& readbackResult)
+                {
+                    m_classificationReadbackResult = readbackResult;
+                    m_readbackState = DiffuseProbeGridReadbackState::Complete;
+                };
+                break;
+            default:
+                AZ_Assert(false, "Unknown readback state");
+            }
+
+            m_attachmentReadback = AZStd::make_shared<AZ::RPI::AttachmentReadback>(AZ::RHI::ScopeId{ "DiffuseProbeGridTextureReadBack" });
+            m_attachmentReadback->SetCallback(callbackFunction);
+
+            AZ::RPI::PassAttachment passAttachment;
+            passAttachment.m_descriptor = descriptor;
+            passAttachment.m_path = attachmentId;
+            passAttachment.m_name = readbackName;
+            passAttachment.m_lifetime = RHI::AttachmentLifetimeType::Imported;
+
+            m_attachmentReadback->ReadPassAttachment(&passAttachment, AZ::Name(readbackName));
+        }
+
+        void DiffuseProbeGridTextureReadback::FrameBegin(AZ::RPI::Pass::FramePrepareParams& params)
+        {
+            if (m_readbackState == DiffuseProbeGridReadbackState::Idle)
+            {
+                return;
+            }
+
+            if (!m_attachmentReadback.get())
+            {
+                return;
+            }
+
+            if (m_readbackState == DiffuseProbeGridReadbackState::Complete)
+            {
+                // readback of all textures is complete, invoke callback and return to Idle state
+                m_callback(
+                    { m_irradianceReadbackResult.m_dataBuffer, m_irradianceReadbackResult.m_imageDescriptor.m_format, m_irradianceReadbackResult.m_imageDescriptor.m_size },
+                    { m_distanceReadbackResult.m_dataBuffer, m_distanceReadbackResult.m_imageDescriptor.m_format, m_distanceReadbackResult.m_imageDescriptor.m_size },
+                    { m_relocationReadbackResult.m_dataBuffer, m_relocationReadbackResult.m_imageDescriptor.m_format, m_relocationReadbackResult.m_imageDescriptor.m_size },
+                    { m_classificationReadbackResult.m_dataBuffer, m_classificationReadbackResult.m_imageDescriptor.m_format, m_classificationReadbackResult.m_imageDescriptor.m_size });
+
+                m_readbackState = DiffuseProbeGridReadbackState::Idle;
+                m_attachmentReadback.reset();
+                return;
+            }
+
+            m_attachmentReadback->FrameBegin(params);
+        }
+    }   // namespace Render
+}   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h
new file mode 100644
index 0000000000..1becd6fb3e
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Code/Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h
@@ -0,0 +1,60 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <Atom/RHI/ScopeProducer.h>
+#include <Atom/RPI.Public/Pass/AttachmentReadback.h>
+#include <Atom/RPI.Public/Pass/Pass.h>
+#include <Atom/Feature/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessorInterface.h>
+
+namespace AZ
+{
+    namespace Render
+    {
+        class DiffuseProbeGrid;
+
+        enum class DiffuseProbeGridReadbackState
+        {
+            Idle,
+            Irradiance,
+            Distance,
+            Relocation,
+            Classification,
+            Complete
+        };
+
+        //! This class contains functionality necessary to read back the DiffuseProbeGrid textures, which
+        //! allows them to be saved as assets to run the DiffuseProbeGrid in non-realtime mode.
+        class DiffuseProbeGridTextureReadback final
+        {
+        public:
+            DiffuseProbeGridTextureReadback(DiffuseProbeGrid* diffuseProbeGrid);
+            ~DiffuseProbeGridTextureReadback() = default;
+
+            void BeginTextureReadback(DiffuseProbeGridBakeTexturesCallback callback);
+            void Update(const AZ::Name& passName);
+            void FrameBegin(AZ::RPI::Pass::FramePrepareParams& params);
+
+        private:
+
+            DiffuseProbeGrid* m_diffuseProbeGrid = nullptr;
+            DiffuseProbeGridReadbackState m_readbackState = DiffuseProbeGridReadbackState::Idle;
+            AZStd::shared_ptr<AZ::RPI::AttachmentReadback> m_attachmentReadback;
+            DiffuseProbeGridBakeTexturesCallback m_callback;
+
+            AZ::RPI::AttachmentReadback::ReadbackResult m_irradianceReadbackResult;
+            AZ::RPI::AttachmentReadback::ReadbackResult m_distanceReadbackResult;
+            AZ::RPI::AttachmentReadback::ReadbackResult m_relocationReadbackResult;
+            AZ::RPI::AttachmentReadback::ReadbackResult m_classificationReadbackResult;
+        };
+    }   // namespace Render
+}   // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
index 32a29cf4d3..2373d0cb00 100644
--- a/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/EditorCommonSystemComponent.cpp
@@ -12,11 +12,9 @@
 
 #include <EditorCommonSystemComponent.h>
 #include <Source/Material/UseTextureFunctorSourceData.h>
-#include <Source/Material/PropertyVisibilityFunctorSourceData.h>
 #include <Source/Material/DrawListFunctorSourceData.h>
 #include <Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h>
 #include <Source/Material/Transform2DFunctorSourceData.h>
-#include <Source/Material/ShaderEnableFunctorSourceData.h>
 #include <Source/Material/ConvertEmissiveUnitFunctorSourceData.h>
 
 #include <Atom/Feature/Utils/EditorLightingPreset.h>
@@ -58,11 +56,9 @@ namespace AZ
                 }
 
                 AZ::Render::UseTextureFunctorSourceData::Reflect(context);
-                AZ::Render::PropertyVisibilityFunctorSourceData::Reflect(context);
                 AZ::Render::DrawListFunctorSourceData::Reflect(context);
                 AZ::Render::Transform2DFunctorSourceData::Reflect(context);
                 AZ::Render::ConvertEmissiveUnitFunctorSourceData::Reflect(context);
-                AZ::Render::ShaderEnableFunctorSourceData::Reflect(context);
                 AZ::Render::SubsurfaceTransmissionParameterFunctorSourceData::Reflect(context);
 
                 AZ::Render::EditorLightingPreset::Reflect(context);
@@ -104,11 +100,9 @@ namespace AZ
             }
 
             materialFunctorRegistration->RegisterMaterialFunctor("UseTexture", azrtti_typeid<UseTextureFunctorSourceData>());
-            materialFunctorRegistration->RegisterMaterialFunctor("UpdatePropertyVisibility", azrtti_typeid<PropertyVisibilityFunctorSourceData>());
             materialFunctorRegistration->RegisterMaterialFunctor("OverrideDrawList",         azrtti_typeid<DrawListFunctorSourceData>());
             materialFunctorRegistration->RegisterMaterialFunctor("Transform2D",              azrtti_typeid<Transform2DFunctorSourceData>());
             materialFunctorRegistration->RegisterMaterialFunctor("ConvertEmissiveUnit",      azrtti_typeid<ConvertEmissiveUnitFunctorSourceData>());
-            materialFunctorRegistration->RegisterMaterialFunctor("ShaderEnable",             azrtti_typeid<ShaderEnableFunctorSourceData>());
             materialFunctorRegistration->RegisterMaterialFunctor("HandleSubsurfaceScatteringParameters", azrtti_typeid<SubsurfaceTransmissionParameterFunctorSourceData>());
             materialFunctorRegistration->RegisterMaterialFunctor("Lua", azrtti_typeid<RPI::LuaMaterialFunctorSourceData>());
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.cpp
deleted file mode 100644
index da8730f1ed..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "PropertyVisibilityFunctor.h"
-
-namespace AZ
-{
-    namespace Render
-    {
-        void PropertyVisibilityFunctor::Reflect(ReflectContext* context)
-        {
-            if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
-            {
-                serializeContext->Class<Action>()
-                    ->Version(1)
-                    ->Field("triggerProperty", &Action::m_triggerPropertyIndex)
-                    ->Field("triggerValue", &Action::m_triggerValue)
-                    ->Field("visibility", &Action::m_visibility)
-                    ;
-                serializeContext->Class<PropertyVisibilityFunctor, RPI::MaterialFunctor>()
-                    ->Version(1)
-                    ->Field("actions",            &PropertyVisibilityFunctor::m_actions)
-                    ->Field("affectedProperties", &PropertyVisibilityFunctor::m_affectedProperties)
-                    ;
-            }
-        }
-
-        void PropertyVisibilityFunctor::Process(EditorContext& context)
-        {
-            bool visibilityApplied = false;
-            RPI::MaterialPropertyVisibility lastAppliedVisibility;
-
-            for (const auto& action : m_actions)
-            {
-                bool willSetVisibility = false;
-                if (action.m_triggerValue.Is<bool>() || action.m_triggerValue.Is<int32_t>() || action.m_triggerValue.Is<uint32_t>())
-                {
-                    willSetVisibility = action.m_triggerValue == context.GetMaterialPropertyValue(action.m_triggerPropertyIndex);
-                }
-                else if (action.m_triggerValue.Is<float>())
-                {
-                    willSetVisibility = AZ::IsClose(action.m_triggerValue.GetValue<float>(),
-                        context.GetMaterialPropertyValue<float>(action.m_triggerPropertyIndex),
-                        std::numeric_limits<float>::epsilon());
-                }
-                else // for types Vector2, Vector3, Vector4, Color, Image
-                {
-                    AZ_Error("PropertyVisibilityFunctor", false, "Unsupported property data type as an enable property.");
-                }
-
-                if (willSetVisibility)
-                {
-                    visibilityApplied = true;
-                    lastAppliedVisibility = action.m_visibility;
-                }
-            }
-
-            if (visibilityApplied)
-            {
-                for (const auto& propertyIndex : m_affectedProperties)
-                {
-                    context.SetMaterialPropertyVisibility(propertyIndex, lastAppliedVisibility);
-                }
-            }
-        }
-
-    } // namespace Render
-} // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.h
deleted file mode 100644
index d1a7772fc8..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
-#include <Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        //! Materials can use this functor to control when and how to set the visibility of a group of properties.
-        class PropertyVisibilityFunctor final
-            : public RPI::MaterialFunctor
-        {
-            friend class PropertyVisibilityFunctorSourceData;
-        public:
-            AZ_RTTI(AZ::Render::PropertyVisibilityFunctor, "{2582B36F-FA7C-450F-B46A-39AAE18356A0}", RPI::MaterialFunctor);
-
-            static void Reflect(ReflectContext* context);
-
-            void Process(EditorContext& context) override;
-
-        private:
-            struct Action
-            {
-                AZ_TYPE_INFO(AZ::Render::PropertyVisibilityFunctor::Action, "{5DF4D981-9D0C-4040-A6C5-52E1D0BD876B}");
-
-                RPI::MaterialPropertyIndex      m_triggerPropertyIndex; //! The control property for affected properties.
-                RPI::MaterialPropertyValue      m_triggerValue;         //! The trigger value of the control property.
-                RPI::MaterialPropertyVisibility m_visibility;           //! The visibility of affected properties when the trigger value is hit.
-            };
-            // Material property inputs...
-            AZStd::vector<Action>                     m_actions;            //! The actions that describes when and what to do with visibilities.
-            AZStd::vector<RPI::MaterialPropertyIndex> m_affectedProperties; //! The properties that are affected by actions.
-        };
-
-    } // namespace Render
-} // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.cpp
deleted file mode 100644
index 3baf27de60..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "PropertyVisibilityFunctorSourceData.h"
-#include <Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-#include <Atom/RPI.Edit/Material/MaterialUtils.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        void PropertyVisibilityFunctorSourceData::Reflect(ReflectContext* context)
-        {
-            if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
-            {
-                serializeContext->Class<ActionSourceData>()
-                    ->Version(1)
-                    ->Field("triggerProperty", &ActionSourceData::m_triggerPropertyName)
-                    ->Field("triggerValue", &ActionSourceData::m_triggerValue)
-                    ->Field("visibility", &ActionSourceData::m_visibility)
-                    ;
-                serializeContext->Class<PropertyVisibilityFunctorSourceData>()
-                    ->Version(2)
-                    ->Field("actions", &PropertyVisibilityFunctorSourceData::m_actions)
-                    ->Field("affectedProperties", &PropertyVisibilityFunctorSourceData::m_affectedPropertyNames)
-                    ;
-            }
-        }
-
-        RPI::MaterialFunctorSourceData::FunctorResult PropertyVisibilityFunctorSourceData::CreateFunctor(const EditorContext& context) const
-        {
-            using namespace RPI;
-
-            RPI::Ptr<PropertyVisibilityFunctor> functor = aznew PropertyVisibilityFunctor;
-
-            functor->m_actions.reserve(m_actions.size());
-
-            for (const auto& actionSource : m_actions)
-            {
-                functor->m_actions.emplace_back();
-                PropertyVisibilityFunctor::Action& action = functor->m_actions.back();
-                action.m_triggerPropertyIndex = context.FindMaterialPropertyIndex(AZ::Name{ actionSource.m_triggerPropertyName });
-                if (action.m_triggerPropertyIndex.IsNull())
-                {
-                    return Failure();
-                }
-                AddMaterialPropertyDependency(functor, action.m_triggerPropertyIndex);
-
-                if (!actionSource.m_triggerValue.Resolve(*context.GetMaterialPropertiesLayout(), Name{ actionSource.m_triggerPropertyName }))
-                {
-                    // Error is reported in Resolve().
-                    return Failure();
-                }
-
-                const MaterialPropertyDescriptor* propertyDescriptor = context.GetMaterialPropertiesLayout()->GetPropertyDescriptor(action.m_triggerPropertyIndex);
-                // Enum type should resolve further to a unit32_t from the string source.
-                if (propertyDescriptor->GetDataType() == RPI::MaterialPropertyDataType::Enum)
-                {
-                    if (!RPI::MaterialUtils::ResolveMaterialPropertyEnumValue(
-                        propertyDescriptor,
-                        Name(actionSource.m_triggerValue.GetValue().GetValue<AZStd::string>()),
-                        action.m_triggerValue))
-                    {
-                        return Failure();
-                    }
-                }
-                else
-                {
-                    action.m_triggerValue = actionSource.m_triggerValue.GetValue();
-                }
-
-                action.m_visibility = actionSource.m_visibility;
-            }
-
-            functor->m_affectedProperties.reserve(m_affectedPropertyNames.size());
-            for (const AZStd::string& name : m_affectedPropertyNames)
-            {
-                RPI::MaterialPropertyIndex index = context.FindMaterialPropertyIndex(AZ::Name{ name });
-                if (index.IsNull())
-                {
-                    return Failure();
-                }
-                functor->m_affectedProperties.push_back(index);
-            }
-
-            return Success(RPI::Ptr<MaterialFunctor>(functor));
-        }
-    } // namespace Render
-} // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.h
deleted file mode 100644
index 6b212f78a0..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/PropertyVisibilityFunctorSourceData.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "PropertyVisibilityFunctor.h"
-#include <Atom/RPI.Edit/Material/MaterialFunctorSourceData.h>
-#include <Atom/RPI.Edit/Material/MaterialPropertyValueSourceData.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        //! Builds a PropertyVisibilityFunctor.
-        //! Materials can use this functor to control whether a specific property group will be enabled.
-        class PropertyVisibilityFunctorSourceData final
-            : public RPI::MaterialFunctorSourceData
-        {
-        public:
-            AZ_RTTI(AZ::Render::PropertyVisibilityFunctorSourceData, "{B44E6929-8FFF-405F-9056-B9B811F97676}", RPI::MaterialFunctorSourceData);
-
-            static void Reflect(ReflectContext* context);
-
-            FunctorResult CreateFunctor(const EditorContext& context) const override;
-        private:
-            struct ActionSourceData
-            {
-                AZ_TYPE_INFO(AZ::Render::PropertyVisibilityFunctorSourceData::ActionSourceData, "{70E01DA6-0B42-4CCB-AAD0-51980DB43F62}");
-                AZStd::string                        m_triggerPropertyName; //! The control property for affected properties.
-                RPI::MaterialPropertyValueSourceData m_triggerValue;        //! The trigger value of the control property.
-                RPI::MaterialPropertyVisibility      m_visibility;          //! The visibility of affected properties when the trigger value is hit.
-            };
-            // Material property inputs...
-            AZStd::vector<ActionSourceData> m_actions;               //! The actions that describes when and what to do with visibilities.
-            AZStd::vector<AZStd::string>    m_affectedPropertyNames; //! The properties that are affected by actions.
-        };
-
-    } // namespace Render
-} // namespace AZ
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.cpp
deleted file mode 100644
index dd602cc4ba..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "./ShaderEnableFunctor.h"
-#include <Atom/RPI.Public/Material/Material.h>
-#include <Atom/RPI.Reflect/Image/Image.h>
-#include <Atom/RPI.Reflect/Shader/ShaderOptionGroup.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        void ShaderEnableFunctor::Reflect(ReflectContext* context)
-        {
-            if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
-            {
-                serializeContext->Class<ShaderEnableFunctor, RPI::MaterialFunctor>()
-                    ->Version(4)
-                    ->Field("opacityModeIndex", &ShaderEnableFunctor::m_opacityModeIndex)
-                    ->Field("parallaxEnableIndex", &ShaderEnableFunctor::m_parallaxEnableIndex)
-                    ->Field("parallaxPdoEnableIndex", &ShaderEnableFunctor::m_parallaxPdoEnableIndex)
-                    ->Field("shadowShaderNoPSIndex", &ShaderEnableFunctor::m_shadowShaderNoPSIndex)
-                    ->Field("shadowShaderWithPSIndex", &ShaderEnableFunctor::m_shadowShaderWithPSIndex)
-                    ->Field("depthShaderNoPSIndex", &ShaderEnableFunctor::m_depthShaderNoPSIndex)
-                    ->Field("depthShaderWithPSIndex", &ShaderEnableFunctor::m_depthShaderWithPSIndex)
-                    ->Field("pbrShaderNoEdsIndex", &ShaderEnableFunctor::m_pbrShaderNoEdsIndex)
-                    ->Field("pbrShaderWithEdsIndex", &ShaderEnableFunctor::m_pbrShaderWithEdsIndex)
-                    ->Field("depthShaderTransparentMin", &ShaderEnableFunctor::m_depthShaderTransparentMin)
-                    ->Field("depthShaderTransparentMax", &ShaderEnableFunctor::m_depthShaderTransparentMax)
-                ;
-            }
-        }
-
-        void ShaderEnableFunctor::Process(RuntimeContext& context)
-        {
-            unsigned int opacityMode = context.GetMaterialPropertyValue<uint32_t>(m_opacityModeIndex);
-            bool parallaxEnabled = context.GetMaterialPropertyValue<bool>(m_parallaxEnableIndex);
-            bool parallaxPdoEnabled = context.GetMaterialPropertyValue<bool>(m_parallaxPdoEnableIndex);
-
-            if (parallaxEnabled && parallaxPdoEnabled)
-            {
-                context.SetShaderEnabled(m_depthShaderNoPSIndex, false);
-                context.SetShaderEnabled(m_shadowShaderNoPSIndex, false);
-                context.SetShaderEnabled(m_pbrShaderWithEdsIndex, false);
-
-                context.SetShaderEnabled(m_depthShaderWithPSIndex, true);
-                context.SetShaderEnabled(m_shadowShaderWithPSIndex, true);
-                context.SetShaderEnabled(m_pbrShaderNoEdsIndex, true);
-            }
-            else
-            {
-                context.SetShaderEnabled(m_depthShaderNoPSIndex, opacityMode == OpacityMode::Opaque );
-                context.SetShaderEnabled(m_shadowShaderNoPSIndex, opacityMode == OpacityMode::Opaque);
-                context.SetShaderEnabled(m_pbrShaderWithEdsIndex, opacityMode == OpacityMode::Opaque || opacityMode == OpacityMode::Blended || opacityMode == OpacityMode::TintedTransparent);
-
-                context.SetShaderEnabled(m_depthShaderWithPSIndex, opacityMode == OpacityMode::Cutout);
-                context.SetShaderEnabled(m_shadowShaderWithPSIndex, opacityMode == OpacityMode::Cutout);
-                context.SetShaderEnabled(m_pbrShaderNoEdsIndex, opacityMode == OpacityMode::Cutout);
-            }
-
-            context.SetShaderEnabled(m_depthShaderTransparentMin, opacityMode == OpacityMode::Blended || opacityMode == OpacityMode::TintedTransparent);
-            context.SetShaderEnabled(m_depthShaderTransparentMax, opacityMode == OpacityMode::Blended || opacityMode == OpacityMode::TintedTransparent);
-        }
-    }
-}
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.h b/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.h
deleted file mode 100644
index ac5f31ba30..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include <Atom/RPI.Reflect/Material/MaterialFunctor.h>
-#include <Atom/RPI.Reflect/Material/MaterialPropertyDescriptor.h>
-#include <Atom/RHI.Reflect/Limits.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        enum OpacityMode
-        {
-            Opaque = 0,
-            Cutout,
-            Blended,
-            TintedTransparent,
-        };
-
-        //! Select shadow and depth shader based on opacity mode and parallax state
-        //! Opaque:                      Enable shader without PS
-        //! Cutout or Parallax enable:   Enable shader with PS
-        //! Blended:                     Disable both
-        //! TintedTransparent:           Disable both
-        class ShaderEnableFunctor final
-            : public RPI::MaterialFunctor
-        {
-            friend class ShaderEnableFunctorSourceData;
-        public:
-            AZ_RTTI(ShaderEnableFunctor, "{2079A693-FE4F-46A7-95C0-09D88AC156D0}", RPI::MaterialFunctor);
-
-            static void Reflect(ReflectContext* context);
-
-            void Process(RuntimeContext& context) override;
-
-        private:
-            RPI::MaterialPropertyIndex m_opacityModeIndex;
-            RPI::MaterialPropertyIndex m_parallaxEnableIndex;
-            RPI::MaterialPropertyIndex m_parallaxPdoEnableIndex;
-
-            uint32_t m_shadowShaderNoPSIndex = -1;
-            uint32_t m_shadowShaderWithPSIndex = -1;
-            uint32_t m_depthShaderNoPSIndex = -1;
-            uint32_t m_depthShaderWithPSIndex = -1;
-            uint32_t m_pbrShaderWithEdsIndex = -1;
-            uint32_t m_pbrShaderNoEdsIndex = -1;
-            // The following are used by the light culling system to produce min/max depth bounds
-            uint32_t m_depthShaderTransparentMin = -1;
-            uint32_t m_depthShaderTransparentMax = -1;
-        };
-    }
-}
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.cpp b/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.cpp
deleted file mode 100644
index 3c16666f82..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#include "./ShaderEnableFunctorSourceData.h"
-#include <Atom/RPI.Reflect/Shader/ShaderOptionGroupLayout.h>
-#include <AzCore/Serialization/SerializeContext.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        void ShaderEnableFunctorSourceData::Reflect(ReflectContext* context)
-        {
-            if (auto* serializeContext = azrtti_cast<SerializeContext*>(context))
-            {
-                serializeContext->Class<ShaderEnableFunctorSourceData>()
-                    ->Version(5)
-                    ->Field("opacityMode", &ShaderEnableFunctorSourceData::m_opacityMode)
-                    ->Field("parallaxEnable", &ShaderEnableFunctorSourceData::m_parallaxEnable)
-                    ->Field("parallaxPdoEnable", &ShaderEnableFunctorSourceData::m_parallaxPdoEnable)
-                    ->Field("shadowShaderNoPSIndex", &ShaderEnableFunctorSourceData::m_shadowShaderNoPSIndex)
-                    ->Field("shadowShaderWithPSIndex", &ShaderEnableFunctorSourceData::m_shadowShaderWithPSIndex)
-                    ->Field("depthShaderNoPSIndex", &ShaderEnableFunctorSourceData::m_depthShaderNoPSIndex)
-                    ->Field("depthShaderWithPSIndex", &ShaderEnableFunctorSourceData::m_depthShaderWithPSIndex)
-                    ->Field("pbrShaderNoEdsIndex", &ShaderEnableFunctorSourceData::m_pbrShaderNoEdsIndex)
-                    ->Field("pbrShaderWithEdsIndex", &ShaderEnableFunctorSourceData::m_pbrShaderWithEdsIndex)
-                    ->Field("depthShaderTransparentMin", &ShaderEnableFunctorSourceData::m_depthShaderTransparentMin)
-                    ->Field("depthShaderTransparentMax", &ShaderEnableFunctorSourceData::m_depthShaderTransparentMax)
-                ;
-            }
-        }
-
-        RPI::MaterialFunctorSourceData::FunctorResult ShaderEnableFunctorSourceData::CreateFunctor(const RuntimeContext& context) const
-        {
-            RPI::Ptr<ShaderEnableFunctor> functor = aznew ShaderEnableFunctor;
-
-            functor->m_opacityModeIndex = context.FindMaterialPropertyIndex(Name{ m_opacityMode });
-            if (functor->m_opacityModeIndex.IsNull())
-            {
-                return Failure();
-            }
-            AddMaterialPropertyDependency(functor, functor->m_opacityModeIndex);
-
-            functor->m_parallaxEnableIndex = context.FindMaterialPropertyIndex(Name{ m_parallaxEnable });
-            if (functor->m_parallaxEnableIndex.IsNull())
-            {
-                return Failure();
-            }
-            AddMaterialPropertyDependency(functor, functor->m_parallaxEnableIndex);
-
-            functor->m_parallaxPdoEnableIndex = context.FindMaterialPropertyIndex(Name{ m_parallaxPdoEnable });
-            if (functor->m_parallaxPdoEnableIndex.IsNull())
-            {
-                return Failure();
-            }
-            AddMaterialPropertyDependency(functor, functor->m_parallaxPdoEnableIndex);
-
-            if (!context.CheckShaderIndexValid(m_shadowShaderWithPSIndex))
-            {
-                return Failure();
-            }
-            functor->m_shadowShaderWithPSIndex = m_shadowShaderWithPSIndex;
-
-            if (!context.CheckShaderIndexValid(m_shadowShaderNoPSIndex))
-            {
-                return Failure();
-            }
-            functor->m_shadowShaderNoPSIndex = m_shadowShaderNoPSIndex;
-
-            if (!context.CheckShaderIndexValid(m_depthShaderWithPSIndex))
-            {
-                return Failure();
-            }
-            functor->m_depthShaderWithPSIndex = m_depthShaderWithPSIndex;
-
-            if (!context.CheckShaderIndexValid(m_depthShaderNoPSIndex))
-            {
-                return Failure();
-            }
-            functor->m_depthShaderNoPSIndex = m_depthShaderNoPSIndex;
-
-            if (!context.CheckShaderIndexValid(m_pbrShaderNoEdsIndex))
-            {
-                return Failure();
-            }
-            functor->m_pbrShaderNoEdsIndex = m_pbrShaderNoEdsIndex;
-
-            if (!context.CheckShaderIndexValid(m_pbrShaderWithEdsIndex))
-            {
-                return Failure();
-            }
-            functor->m_pbrShaderWithEdsIndex = m_pbrShaderWithEdsIndex;
-            if (!context.CheckShaderIndexValid(m_depthShaderTransparentMin))
-            {
-                return Failure();
-            }
-            functor->m_depthShaderTransparentMin = m_depthShaderTransparentMin;
-            if (!context.CheckShaderIndexValid(m_depthShaderTransparentMax))
-            {
-                return Failure();
-            }
-            functor->m_depthShaderTransparentMax = m_depthShaderTransparentMax;
-
-            return Success(RPI::Ptr<RPI::MaterialFunctor>(functor));
-        }
-    }
-}
diff --git a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.h b/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.h
deleted file mode 100644
index 2d00a4a015..0000000000
--- a/Gems/Atom/Feature/Common/Code/Source/Material/ShaderEnableFunctorSourceData.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-* its licensors.
-*
-* For complete copyright and license terms please see the LICENSE at the root of this
-* distribution (the "License"). All use of this software is governed by the License,
-* or, if provided, by the license below or the license accompanying this file. Do not
-* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*
-*/
-
-#pragma once
-
-#include "./ShaderEnableFunctor.h"
-#include <Atom/RPI.Edit/Material/MaterialFunctorSourceData.h>
-
-namespace AZ
-{
-    namespace Render
-    {
-        class ShaderEnableFunctor;
-
-        //! Builds a ShaderEnableFunctor
-        class ShaderEnableFunctorSourceData final
-            : public RPI::MaterialFunctorSourceData
-        {
-        public:
-            AZ_RTTI(ShaderEnableFunctorSourceData, "{63775ECB-5C3E-44D3-B175-4537BF76C3A7}", RPI::MaterialFunctorSourceData);
-
-            static void Reflect(ReflectContext* context);
-
-            FunctorResult CreateFunctor(const RuntimeContext& context) const override;
-
-        private:
-
-            AZStd::string m_opacityMode;
-            AZStd::string m_parallaxEnable;
-            AZStd::string m_parallaxPdoEnable;
-
-            uint32_t m_shadowShaderNoPSIndex = -1;
-            uint32_t m_shadowShaderWithPSIndex = -1;
-            uint32_t m_depthShaderNoPSIndex = -1;
-            uint32_t m_depthShaderWithPSIndex = -1;
-            uint32_t m_pbrShaderWithEdsIndex = -1;
-            uint32_t m_pbrShaderNoEdsIndex = -1;
-            // The following are used by the light culling system to produce min/max depth bounds
-            uint32_t m_depthShaderTransparentMin = -1;
-            uint32_t m_depthShaderTransparentMax = -1;
-        };
-    }
-}
diff --git a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
index 4059d65cbb..117b177f05 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
@@ -741,7 +741,7 @@ namespace AZ
 
                 // retrieve vertex/index buffers
                 RPI::ModelLod::StreamBufferViewList streamBufferViews;
-                [[maybe_unused]] bool result = modelLod->GetStreamsForMesh(inputStreamLayout, streamBufferViews, shaderInputContract, meshIndex);
+                [[maybe_unused]] bool result = modelLod->GetStreamsForMesh(inputStreamLayout, streamBufferViews, nullptr, shaderInputContract, meshIndex);
                 AZ_Assert(result, "Failed to retrieve mesh stream buffer views");
 
                 // note that the element count is the size of the entire buffer, even though this mesh may only
diff --git a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
index c4e9306dc9..7c13daea3b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
@@ -318,7 +318,7 @@ namespace AZ
                 {
                     AZ::Transform meshTransform = transformFeatureProcessor->GetTransformForId(TransformServiceFeatureProcessorInterface::ObjectId(mesh.first));
                     AZ::Transform noScaleTransform = meshTransform;
-                    noScaleTransform.ExtractScale();
+                    noScaleTransform.ExtractUniformScale();
                     AZ::Matrix3x3 rotationMatrix = Matrix3x3::CreateFromTransform(noScaleTransform);
                     rotationMatrix = rotationMatrix.GetInverseFull().GetTranspose();
 
diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
index 3497855c07..3e9e316a5a 100644
--- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
@@ -209,7 +209,7 @@ namespace AZ
         void ReflectionProbe::SetTransform(const AZ::Transform& transform)
         {
             // retrieve previous scale and revert the scale on the inner/outer extents
-            AZ::Vector3 previousScale = m_transform.GetScale();
+            float previousScale = m_transform.GetUniformScale();
             m_outerExtents /= previousScale;
             m_innerExtents /= previousScale;
 
@@ -218,12 +218,12 @@ namespace AZ
 
             // avoid scaling the visualization sphere
             AZ::Transform visualizationTransform = m_transform;
-            visualizationTransform.ExtractScale();
+            visualizationTransform.ExtractUniformScale();
             m_meshFeatureProcessor->SetTransform(m_visualizationMeshHandle, visualizationTransform);
 
             // update the inner/outer extents with the new scale
-            m_outerExtents *= m_transform.GetScale();
-            m_innerExtents *= m_transform.GetScale();
+            m_outerExtents *= m_transform.GetUniformScale();
+            m_innerExtents *= m_transform.GetUniformScale();
 
             m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f);
             m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f);
@@ -232,14 +232,14 @@ namespace AZ
 
         void ReflectionProbe::SetOuterExtents(const AZ::Vector3& outerExtents)
         {
-            m_outerExtents = outerExtents * m_transform.GetScale();
+            m_outerExtents = outerExtents * m_transform.GetUniformScale();
             m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f);
             m_updateSrg = true;
         }
 
         void ReflectionProbe::SetInnerExtents(const AZ::Vector3& innerExtents)
         {
-            m_innerExtents = innerExtents * m_transform.GetScale();
+            m_innerExtents = innerExtents * m_transform.GetUniformScale();
             m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f);
             m_updateSrg = true;
         }
diff --git a/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
index acb6e4a287..fb73d0f416 100644
--- a/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
@@ -231,7 +231,7 @@ namespace AZ
             AZ_Error("TransformServiceFeatureProcessor", id.IsValid(), "Attempting to get the transform for an invalid handle.");
             AZ::Matrix3x4 matrix3x4 = AZ::Matrix3x4::CreateFromRowMajorFloat12(m_objectToWorldTransforms.at(id.GetIndex()).m_transform);
             AZ::Transform transform = AZ::Transform::CreateFromMatrix3x4(matrix3x4);
-            transform.ExtractScale();
+            transform.ExtractUniformScale();
             return transform;
         }
 
diff --git a/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
index 3a749a4b67..4e7cc9dab3 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_editor_files.cmake
@@ -24,16 +24,12 @@ set(FILES
     Source/Material/ConvertEmissiveUnitFunctorSourceData.h
     Source/Material/MaterialConverterSystemComponent.cpp
     Source/Material/MaterialConverterSystemComponent.h
-    Source/Material/ShaderEnableFunctorSourceData.cpp
-    Source/Material/ShaderEnableFunctorSourceData.h
     Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.cpp
     Source/Material/SubsurfaceTransmissionParameterFunctorSourceData.h
     Source/Material/Transform2DFunctorSourceData.cpp
     Source/Material/Transform2DFunctorSourceData.h
     Source/Material/UseTextureFunctorSourceData.cpp
     Source/Material/UseTextureFunctorSourceData.h
-    Source/Material/PropertyVisibilityFunctorSourceData.cpp
-    Source/Material/PropertyVisibilityFunctorSourceData.h
     Source/Material/DrawListFunctorSourceData.cpp
     Source/Material/DrawListFunctorSourceData.h
 )
diff --git a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
index 8926b0c19f..4f98046adb 100644
--- a/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
+++ b/Gems/Atom/Feature/Common/Code/atom_feature_common_files.cmake
@@ -135,6 +135,8 @@ set(FILES
     Source/DiffuseProbeGrid/DiffuseProbeGridRenderPass.h
     Source/DiffuseProbeGrid/DiffuseProbeGrid.cpp
     Source/DiffuseProbeGrid/DiffuseProbeGrid.h
+    Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.cpp
+    Source/DiffuseProbeGrid/DiffuseProbeGridTextureReadback.h
     Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.h
     Source/DiffuseProbeGrid/DiffuseProbeGridFeatureProcessor.cpp
     Source/DisplayMapper/AcesOutputTransformPass.cpp
@@ -153,16 +155,12 @@ set(FILES
     Source/LookupTable/LookupTableAsset.cpp
     Source/Material/ConvertEmissiveUnitFunctor.cpp
     Source/Material/ConvertEmissiveUnitFunctor.h
-    Source/Material/ShaderEnableFunctor.cpp
-    Source/Material/ShaderEnableFunctor.h
     Source/Material/SubsurfaceTransmissionParameterFunctor.cpp
     Source/Material/SubsurfaceTransmissionParameterFunctor.h
     Source/Material/Transform2DFunctor.cpp
     Source/Material/Transform2DFunctor.h
     Source/Material/UseTextureFunctor.cpp
     Source/Material/UseTextureFunctor.h
-    Source/Material/PropertyVisibilityFunctor.cpp
-    Source/Material/PropertyVisibilityFunctor.h
     Source/Material/DrawListFunctor.cpp
     Source/Material/DrawListFunctor.h
     Source/Math/GaussianMathFilter.h
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
index 2073c48d25..a5d8f53573 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/ShaderCompilerArguments.h
@@ -13,6 +13,8 @@
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Preprocessor/Enum.h>
+#include <AzCore/std/string/string.h>
+#include <AtomCore/std/containers/array_view.h>
 
 namespace AZ
 {
@@ -30,9 +32,16 @@ namespace AZ
 
             static void Reflect(ReflectContext* context);
 
+            //! Returns true if either @m_azslcAdditionalFreeArguments or @m_dxcAdditionalFreeArguments contain
+            //! macro definitions, e.g. "-D MACRO" or "-D MACRO=VALUE" or "-DMACRO", "-DMACRO=VALUE".
+            //! It is used for validation to forbid macro definitions, because the idea is that this struct
+            //! is used inside GlobalBuildOptions which has a dedicated variable for macro definitions.
+            bool HasMacroDefinitionsInCommandLineArguments();
+
             //! Mix two instances of arguments, by or-ing bools, or by "if different, right hand side wins"
             void Merge(const ShaderCompilerArguments& right);
 
+            //! [GFX TODO] [ATOM-15472] Remove this function.
             //! Determine whether there is a rebuild-worthy difference in arguments for AZSLc
             bool HasDifferentAzslcArguments(const ShaderCompilerArguments& right) const;
 
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
index 3e593794af..6f884eb358 100644
--- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
+++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Edit/Utils.h
@@ -110,6 +110,46 @@ namespace AZ
         AZStd::string BuildFileNameWithExtension(const AZStd::string& shaderSourceFile,
                                       const AZStd::string& tempFolder,
                                       const char* outputExtension);
+
+        namespace CommandLineArgumentUtils
+        {
+            //! @param commandLineString: A string with command line arguments of the form:
+            //!             "-<arg1> --<arg2> --<arg3>[=<value3>] ..."
+            //!             Example: "--use-spaces --namespace=vk -W1"
+            //! Returns: A list with just the [-|--]<argument name>:
+            //!          ["-<arg1>", "--<arg2>", "--arg3"]
+            //!          For the example shown above it will return this vector:
+            //!          ["--use-spaces", "--namespace", "-W1]
+            AZStd::vector<AZStd::string> GetListOfArgumentNames(AZStd::string_view commandLineString);
+
+            //! Takes a list of names of command line arguments and removes those arguments from @commandLineString.
+            //! The core functionality of this function is that it searches by name in @commandLineString and removes
+            //! name and value if the name is found.
+            //! @param listOfArguments: This is a list of strings, usually generated by the helper function
+            //! ShaderCompilerArguments::GetListOfArgumentNames()
+            //! @param commandLineString: A single string made of several command line arguments
+            //! @returns A new string based on @commandLineString but with the matching arguments and their values
+            //!          removed from it.
+            AZStd::string RemoveArgumentsFromCommandLineString(
+                AZStd::array_view<AZStd::string> listOfArguments, AZStd::string_view commandLineString);
+
+            //! @param commandLineString: "  --arg1   -arg2     --arg3=foo --arg4=bar  "
+            //! @returns "--arg1 -arg2 --arg3=foo --arg4=bar"
+            AZStd::string RemoveExtraSpaces(AZStd::string_view commandLineString);
+
+            //! Accepts two arbitrary strings that contain typical command line arguments and returns
+            //! a new string that combines the arguments were the arguments on the @right have precedence.
+            //! Example:
+            //! @param left: "--arg1 -arg2 --arg3=foo"
+            //! @param right: "--arg3=bar --arg4"
+            //! @returns: "--arg1 -arg2 --arg3=bar --arg4"
+            AZStd::string MergeCommandLineArguments(AZStd::string_view left, AZStd::string_view right);
+
+            //! @param commandLineString: A string that contains a series of command line arguments.
+            //! @returns: true if @commandLineString contains macro definitions, e.g:
+            //!           "-D MACRO" or "-D MACRO=VALUE" or "-DMACRO", "-DMACRO=VALUE".
+            bool HasMacroDefinitions(AZStd::string_view commandLineString);
+        }
     }
 }
 
diff --git a/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp b/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
index 7304a351d4..09cd1c125e 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Edit/ShaderCompilerArguments.cpp
@@ -12,6 +12,9 @@
 
 #include <Atom/RHI.Edit/ShaderCompilerArguments.h>
 #include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/std/string/regex.h>
+
+#include <Atom/RHI.Edit/Utils.h>
 
 namespace AZ
 {
@@ -49,6 +52,12 @@ namespace AZ
             }
         }
 
+        bool ShaderCompilerArguments::HasMacroDefinitionsInCommandLineArguments()
+        {
+            return CommandLineArgumentUtils::HasMacroDefinitions(m_azslcAdditionalFreeArguments) ||
+                CommandLineArgumentUtils::HasMacroDefinitions(m_dxcAdditionalFreeArguments);
+        }
+
         void ShaderCompilerArguments::Merge(const ShaderCompilerArguments& right)
         {
             if (right.m_azslcWarningLevel != LevelUnset)
@@ -56,7 +65,7 @@ namespace AZ
                 m_azslcWarningLevel = right.m_azslcWarningLevel;
             }
             m_azslcWarningAsError = m_azslcWarningAsError || right.m_azslcWarningAsError;
-            m_azslcAdditionalFreeArguments += " " + right.m_azslcAdditionalFreeArguments;
+            m_azslcAdditionalFreeArguments = CommandLineArgumentUtils::MergeCommandLineArguments(m_azslcAdditionalFreeArguments, right.m_azslcAdditionalFreeArguments);
             m_dxcDisableWarnings = m_dxcDisableWarnings || right.m_dxcDisableWarnings;
             m_dxcWarningAsError = m_dxcWarningAsError || right.m_dxcWarningAsError;
             m_dxcDisableOptimizations = m_dxcDisableOptimizations || right.m_dxcDisableOptimizations;
@@ -65,13 +74,14 @@ namespace AZ
             {
                 m_dxcOptimizationLevel = right.m_dxcOptimizationLevel;
             }
-            m_dxcAdditionalFreeArguments += " " + right.m_dxcAdditionalFreeArguments;
+            m_dxcAdditionalFreeArguments = CommandLineArgumentUtils::MergeCommandLineArguments(m_dxcAdditionalFreeArguments, right.m_dxcAdditionalFreeArguments);
             if (right.m_defaultMatrixOrder != MatrixOrder::Default)
             {
                 m_defaultMatrixOrder = right.m_defaultMatrixOrder;
             }
         }
 
+        //! [GFX TODO] [ATOM-15472] Remove this function.
         bool ShaderCompilerArguments::HasDifferentAzslcArguments(const ShaderCompilerArguments& right) const
         {
             auto isSet = +[](uint8_t level) { return level != LevelUnset; };
@@ -154,7 +164,7 @@ namespace AZ
                 arguments += " -Zi";  // Generate debug information
                 arguments += " -Zss"; // Compute Shader Hash considering source information
             }
-            arguments += m_dxcAdditionalFreeArguments;
+            arguments += " " + m_dxcAdditionalFreeArguments;
             return arguments;
         }
     }
diff --git a/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp b/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
index 00b5dada69..dc0efb7e9a 100644
--- a/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI.Edit/Utils.cpp
@@ -494,5 +494,64 @@ namespace AZ
             AzFramework::StringFunc::Path::ReplaceExtension(outputFile, outputExtension);
             return outputFile;
         }
+
+        namespace CommandLineArgumentUtils
+        {
+            AZStd::vector<AZStd::string> GetListOfArgumentNames(AZStd::string_view commandLineString)
+            {
+                AZStd::vector<AZStd::string> listOfTokens;
+                AzFramework::StringFunc::Tokenize(commandLineString, listOfTokens, " \t\n");
+                AZStd::vector<AZStd::string> listOfArguments;
+                for (const AZStd::string& token : listOfTokens)
+                {
+                    AZStd::vector<AZStd::string> splitArguments;
+                    AzFramework::StringFunc::Tokenize(token, splitArguments, "=");
+                    listOfArguments.push_back(splitArguments[0]);
+                }
+                return listOfArguments;
+            }
+
+            AZStd::string RemoveArgumentsFromCommandLineString(
+                AZStd::array_view<AZStd::string> listOfArgumentsToRemove, AZStd::string_view commandLineString)
+            {
+                AZStd::string customizedArguments = commandLineString;
+                for (const AZStd::string& azslcArgumentName : listOfArgumentsToRemove)
+                {
+                    AZStd::string regexStr = AZStd::string::format("%s(=\\S+)?", azslcArgumentName.c_str());
+                    AZStd::regex replaceRegex(regexStr, AZStd::regex::ECMAScript);
+                    customizedArguments = AZStd::regex_replace(customizedArguments, replaceRegex, "");
+                }
+                return customizedArguments;
+            }
+
+            AZStd::string RemoveExtraSpaces(AZStd::string_view commandLineString)
+            {
+                AZStd::vector<AZStd::string> argumentList;
+                AzFramework::StringFunc::Tokenize(commandLineString, argumentList, " \t\n");
+                AZStd::string cleanStringWithArguments;
+                AzFramework::StringFunc::Join(cleanStringWithArguments, argumentList.begin(), argumentList.end(), " ");
+                return cleanStringWithArguments;
+            }
+
+            AZStd::string MergeCommandLineArguments(AZStd::string_view left, AZStd::string_view right)
+            {
+                auto listOfArgumentNamesFromRight = GetListOfArgumentNames(right);
+                auto leftWithRightArgumentsRemoved = RemoveArgumentsFromCommandLineString(listOfArgumentNamesFromRight, left);
+                AZStd::string combinedArguments = AZStd::string::format("%s %s", leftWithRightArgumentsRemoved.c_str(), right.data());
+                return RemoveExtraSpaces(combinedArguments);
+            }
+
+            bool HasMacroDefinitions(AZStd::string_view commandLineString)
+            {
+                const AZStd::regex macroRegex(R"((^-D\s*(\w+))|(\s+-D\s*(\w+)))", AZStd::regex::ECMAScript);
+
+                AZStd::smatch match;
+                if (AZStd::regex_search(commandLineString.data(), match, macroRegex))
+                {
+                    return (match.size() >= 1);
+                }
+                return false;
+            }
+        } //namespace CommandLineArgumentUtils
     } // namespace RHI
 } // namespace AZ
diff --git a/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp b/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
index 506edc0d1e..afeca6e617 100644
--- a/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
+++ b/Gems/Atom/RHI/Code/Tests/UtilsTests.cpp
@@ -60,7 +60,9 @@ namespace UnitTest
 
     TEST_F(UtilsTests, LoadFileString_Error_DoesNotExist)
     {
+        AZ_TEST_START_TRACE_SUPPRESSION;
         auto outcome = AZ::RHI::LoadFileString("FileDoesNotExist");
+        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
         EXPECT_FALSE(outcome.IsSuccess());
         EXPECT_TRUE(outcome.GetError().find("Could not open file") != AZStd::string::npos);
         EXPECT_TRUE(outcome.GetError().find("FileDoesNotExist") != AZStd::string::npos);
@@ -68,7 +70,9 @@ namespace UnitTest
 
     TEST_F(UtilsTests, LoadFileBytes_Error_DoesNotExist)
     {
+        AZ_TEST_START_TRACE_SUPPRESSION;
         auto outcome = AZ::RHI::LoadFileBytes("FileDoesNotExist");
+        AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT;
         EXPECT_FALSE(outcome.IsSuccess());
         EXPECT_TRUE(outcome.GetError().find("Could not open file") != AZStd::string::npos);
         EXPECT_TRUE(outcome.GetError().find("FileDoesNotExist") != AZStd::string::npos);
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index 841c71126a..c4666578a7 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -251,7 +251,7 @@ namespace AZ
             ByProducts& byProducts) const
         {
             // Shader compiler executable
-            static const char* dxcRelativePath = "Builders/DirectXShaderCompilerAz/bin/dxc";
+            static const char* dxcRelativePath = "Builders/DirectXShaderCompiler/bin/dxc";
 
             // Output file
             AZStd::string shaderMSLOutputFile = RHI::BuildFileNameWithExtension(shaderSourceFile, tempFolder, "metal");
diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
index 35ee5a7ec0..0be84dba15 100644
--- a/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
+++ b/Gems/Atom/RHI/Null/Code/Source/RHI.Builders/ShaderPlatformInterface.cpp
@@ -104,7 +104,7 @@ namespace AZ
             {
                 return WindowsAzslShaderHeader;
             }
-            else if (platform.m_identifier == "osx_gl")
+            else if (platform.m_identifier == "mac")
             {
                 return MacAzslShaderHeader;
             }
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
index cdacd2578f..791fa006b0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
@@ -180,6 +180,7 @@ namespace AZ
             for (uint32_t imageIndex = static_cast<uint32_t>(NullDescriptorManager::ImageTypes::General2D); imageIndex < static_cast<uint32_t>(NullDescriptorManager::ImageTypes::Count); imageIndex++)
             {
                 // different options for the images
+                imageCreateInfo.imageType = (imageIndex >= static_cast<uint32_t>(NullDescriptorManager::ImageTypes::General3D)) ? VK_IMAGE_TYPE_3D : VK_IMAGE_TYPE_2D;
                 imageCreateInfo.extent = { m_imageNullDescriptor.m_images[imageIndex].m_dimension, m_imageNullDescriptor.m_images[imageIndex].m_dimension, 1 };
                 imageCreateInfo.samples = m_imageNullDescriptor.m_images[imageIndex].m_sampleCountFlag;
                 imageCreateInfo.format = m_imageNullDescriptor.m_images[imageIndex].m_format;
diff --git a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
index 2381febed0..9b90c40ab9 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/Math.azsli
@@ -225,3 +225,16 @@ float NextRandomFloatUniform(inout uint seed)
     seed = Xorshift(seed);
     return (float)seed /  4294967295.0f;
 }
+
+//! Returns the inverse of lerp, 't', such that value = lerp(a, b, t), or returns 0 when a == b.
+float LerpInverse(float a, float b, float value)
+{
+    if(abs(a - b) <= EPSILON)
+    {
+        return 0.0;
+    }
+    else
+    {
+        return (value - a) / (b - a);
+    }
+}
diff --git a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
index 69381ca0fc..e12736dfec 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli
@@ -16,7 +16,12 @@
 
 ShaderResourceGroup DrawSrg : SRG_PerDraw
 {
-    float4 m_placeholder; // [GFX-TODO] [Atom-1727] Bug in AZSLc, empty SRGs cannot be shader variant fallbacks!
     // This SRG is unique per draw packet
+    uint m_uvStreamTangentBitmask;
+    
+    uint GetTangentAtUv(uint uvIndex)
+    {
+        return (m_uvStreamTangentBitmask >> (4 * uvIndex)) & 0xF;
+    }
 }
 
diff --git a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
index 13e3c652db..62111b3e80 100644
--- a/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
+++ b/Gems/Atom/RPI/Assets/ShaderLib/Atom/RPI/TangentSpace.azsli
@@ -52,6 +52,12 @@ float3 GetTangentSpaceNormal_Unnormalized(float2 normalMapSample, float normalSt
     // The image build pipeline drops the B channel so we have to reconstruct it here.
     surfaceNormal.z = sqrt(1 - dot(surfaceNormal.xy, surfaceNormal.xy));
     
+    // Don't allow z to be zero just in case normalStrength approaches 0, to avoid a 0-length normal.
+    // It doesn't make sense anyway to have a surface with a normal map completely tangential.
+    // This also addresses the possibility of z being NaN, in the case where x^2+y^2 > 1, so we don't need to call saturate in the sqrt operation above.
+    // (Note this edge case would be particularly evident in multilayer material types, where the normal map is masked out using normalStrength).
+    surfaceNormal.z = max(surfaceNormal.z, 0.01);
+
     surfaceNormal.xy *= normalStrength;
 
     return surfaceNormal;
@@ -190,12 +196,22 @@ void SurfaceGradientNormalMapping_GenerateTB(float2 uv, out float3 tangentWS, ou
 }
 
 //! Utility macro to nest SGBNM setup processes.
-#define PrepareGeneratedTangent(normal, worldPos, isFrontFace, uvSets, uvSetCount, outTangents, outBitangents, startIndex)  \
+//! We support two UV streams, but only a single stream of tangent/bitangent.
+//! By default, the first UV stream is applied and the default tangent/bitangent are used.
+//! If anything uses the second UV stream, and it is not a duplication of the first stream,
+//! generated tangent/bitangent will be applied.
+//! (As it implies, cases may occur where all/none of the UV steams use the default TB.)
+//! What tangent/bitangent a UV stream uses is encoded in DrawSrg.
+#define PrepareGeneratedTangent(normal, worldPos, isFrontFace, uvSets, uvSetCount, outTangents, outBitangents)              \
 {                                                                                                                           \
     SurfaceGradientNormalMapping_Init(normal, worldPos, !isFrontFace);                                                      \
     [unroll]                                                                                                                \
-    for (int i = startIndex; i < uvSetCount; ++i)                                                                           \
+    for (uint i = 0; i < uvSetCount; ++i)                                                                                   \
     {                                                                                                                       \
+        if (DrawSrg::GetTangentAtUv(i) == 0)                                                                                \
+        {                                                                                                                   \
+            continue;                                                                                                       \
+        }                                                                                                                   \
         SurfaceGradientNormalMapping_GenerateTB(uvSets[i], outTangents[i], outBitangents[i]);                               \
     }                                                                                                                       \
 }
diff --git a/Gems/Atom/RPI/Code/CMakeLists.txt b/Gems/Atom/RPI/Code/CMakeLists.txt
index f92213d9d7..d2b7fba071 100644
--- a/Gems/Atom/RPI/Code/CMakeLists.txt
+++ b/Gems/Atom/RPI/Code/CMakeLists.txt
@@ -69,6 +69,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             PRIVATE
                 AZ::AtomCore
                 AZ::AzToolsFramework
+                Gem::Atom_RHI.Edit
                 Gem::Atom_RPI.Public
     )
 
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
index e4b9b91e81..2dd0865688 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h
@@ -87,6 +87,14 @@ namespace AZ
             //! Finalize and validate initialization. Any initialization functions should be called before EndInit is called. 
             void EndInit();
 
+            //! Set up the DynamicDrawContext for the input Scene.
+            //! This should be called after the last frame is done and before any draw calls.
+            void SetScene(Scene* scene);
+
+            //! Set up the DynamicDrawContext for the input RenderPipeline.
+            //! This should be called after the last frame is done and before any draw calls.
+            void SetRenderPipeline(RenderPipeline* pipeline);
+
             //! Return if this DynamicDrawContext is ready to add draw calls
             bool IsReady();
 
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
index 0aa979d611..70cabca371 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/MeshDrawPacket.h
@@ -98,7 +98,7 @@ namespace AZ
             //! List of shader options set for this specific draw packet
             typedef AZStd::pair<Name, RPI::ShaderOptionValue> ShaderOptionPair;
             typedef AZStd::vector<ShaderOptionPair> ShaderOptionVector;
-            ShaderOptionVector m_shaderOptions;            
+            ShaderOptionVector m_shaderOptions;
         };
     } // namespace RPI
 } // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
index 285cf80aca..5a1c571a26 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/ModelLod.h
@@ -14,6 +14,7 @@
 
 #include <Atom/RPI.Public/Buffer/Buffer.h>
 #include <Atom/RPI.Public/Material/Material.h>
+#include <Atom/RPI.Public/Model/UvStreamTangentBitmask.h>
 
 #include <Atom/RHI/DrawItem.h>
 
@@ -108,6 +109,7 @@ namespace AZ
                 const MaterialUvNameMap& materialUvNameMap = {}) const;
 
             //! Fills a InputStreamLayout and StreamBufferViewList for the set of streams that satisfy a ShaderInputContract.
+            // @param uvStreamTangentBitmaskOut a mask processed during UV stream matching, and later to determine which tangent/bitangent stream to use.
             // @param contract the contract that defines the expected inputs for a shader, used to determine which streams are optional.
             // @param meshIndex the index of the mesh to search in.
             // @param materialModelUvMap a map of UV name overrides, which can be supplied to bind a specific mesh stream name to a different material shader stream name.
@@ -115,6 +117,7 @@ namespace AZ
             bool GetStreamsForMesh(
                 RHI::InputStreamLayout& layoutOut,
                 ModelLod::StreamBufferViewList& streamBufferViewsOut,
+                UvStreamTangentBitmask* uvStreamTangentBitmaskOut,
                 const ShaderInputContract& contract,
                 size_t meshIndex,
                 const MaterialModelUvOverrideMap& materialModelUvMap = {},
@@ -130,6 +133,8 @@ namespace AZ
                 const ModelLodAsset::Mesh::StreamBufferInfo& streamBufferInfo,
                 Mesh& meshInstance);
 
+            StreamInfoList::const_iterator FindFirstUvStreamFromMesh(size_t meshIndex) const;
+
             StreamInfoList::const_iterator FindDefaultUvStream(size_t meshIndex, const MaterialUvNameMap& materialUvNameMap) const;
 
             // Finds a mesh vertex input stream that is the best match for a contracted stream channel.
@@ -137,12 +142,16 @@ namespace AZ
             // @param materialModelUvMap a map of UV name overrides, which can be supplied to bind a specific mesh stream name to a different material shader stream name.
             // @param materialUvNameMap the UV name map that came from a MaterialTypeAsset, which defines the default set of material shader stream names.
             // @param defaultUv the default UV stream to use if a matching UV stream could not be found. Use FindDefaultUvStream() to populate this.
+            // @param firstUv the first UV stream from the mesh, which, by design, the tangent/bitangent stream belongs to.
+            // @param uvStreamTangentIndex a bitset indicating which tangent/bitangent stream (including generated ones) a UV stream will be using.
             StreamInfoList::const_iterator FindMatchingStream(
                 size_t meshIndex,
                 const MaterialModelUvOverrideMap& materialModelUvMap,
                 const MaterialUvNameMap& materialUvNameMap,
                 const ShaderInputContract::StreamChannelInfo& contractStreamChannel,
-                StreamInfoList::const_iterator defaultUv) const;
+                StreamInfoList::const_iterator defaultUv,
+                StreamInfoList::const_iterator firstUv,
+                UvStreamTangentBitmask* uvStreamTangentBitmaskOut) const;
 
             // Meshes may share index/stream buffers in an LOD or they may have 
             // unique buffers. Often the asset builder will prioritize shared buffers
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
new file mode 100644
index 0000000000..aa599bc27c
--- /dev/null
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
@@ -0,0 +1,72 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <limits.h>
+
+#include <AzCore/base.h>
+
+namespace AZ
+{
+    namespace RPI
+    {
+        //! An encoded bitmask for tangent used by UV streams.
+        //! It contains the information about number of UV streams and which tangent/bitangent is used by each UV stream.
+        //! See m_mask for more details.
+        //! The mask will be passed through per draw SRG.
+        class UvStreamTangentBitmask
+        {
+        public:
+            //! Get the full mask including number of UVs and tangent/bitangent assignment to each UV.
+            uint32_t GetFullTangentBitmask() const;
+
+            //! Get number of UVs that have tangent/bitangent assigned.
+            uint32_t GetUvStreamCount() const;
+
+            //! Get tangent/bitangent assignment to the specified UV in the material.
+            //! @param uvIndex the index of the UV from the material, in default order as in the shader code.
+            uint32_t GetTangentAtUv(uint32_t uvIndex) const;
+
+            //! Apply the tangent to the next UV, whose index is the same as GetUvStreamCount.
+            //! @param tangent the tangent/bitangent to be assigned. Ranged in [0, 0xF)
+            //!        It comes from the model in order, e.g. 0 means the first available tangent stream from the model.
+            //!        Specially, value 0xF(=UnassignedTangent) means generated tangent/bitangent will be used in shader.
+            //!        If ranged out of definition, unassigned tangent will be applied.
+            void ApplyTangent(uint32_t tangent);
+
+            //! Reset the bitmask to clear state.
+            void Reset();
+
+            //! The bit mask indicating generated tangent/bitangent will be used.
+            static constexpr uint32_t UnassignedTangent = 0b1111u;
+
+            //! The variable name defined in the SRG shader code.
+            static constexpr const char* SrgName = "m_uvStreamTangentBitmask";
+        private:
+            //! Mask composition:
+            //! The number of UV slots (highest 4 bits) + tangent mask (4 bits each) * 7
+            //! e.g. 0x200000F0 means there are 2 UV streams,
+            //!      the first UV stream uses 0th tangent stream (0x0),
+            //!      the second UV stream uses the generated tangent stream (0xF).
+            uint32_t m_mask = 0;
+
+            //! Bit size in the mask composition.
+            static constexpr uint32_t BitsPerTangent = 4;
+            static constexpr uint32_t BitsForUvIndex = 4;
+
+        public:
+            //! Max UV slots available in this bit mask.
+            static constexpr uint32_t MaxUvSlots = (sizeof(m_mask) * CHAR_BIT - BitsForUvIndex) / BitsPerTangent;
+        };
+    }
+}
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
index 4f24a20f35..8075c6fc5d 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/ViewportContext.h
@@ -26,9 +26,9 @@ namespace AZ
         class ViewportContextManager;
 
         //! ViewportContext wraps a native window and represents a minimal viewport
-        //! in which a scene is rendered on-screen
+        //! in which a scene is rendered on-screen.
         //! ViewportContexts are registered on creation to allow consumers to listen to notifications
-        //! and manage the view stack for a given viewport
+        //! and manage the view stack for a given viewport.
         class ViewportContext
             : public SceneNotificationBus::Handler
             , public AzFramework::WindowNotificationBus::Handler
@@ -61,11 +61,11 @@ namespace AZ
 
             //! Gets the current name of this ViewportContext.
             //! This name is used to tie this ViewportContext to its View stack, and ViewportContexts may be
-            //! renamed via AZ::Interface<ViewportContextRequestsInterface>::Get()->RenameViewportContext.
+            //! renamed via AZ::RPI::ViewportContextRequests::Get()->RenameViewportContext(...).
             AZ::Name GetName() const;
 
             //! Gets the default view associated with this ViewportContext.
-            //! Alternatively, use AZ::Interface<ViewportContextRequestsInterface>::Get()->GetCurrentView.
+            //! Alternatively, use  AZ::RPI::ViewportContextRequests::Get()->GetCurrentView().
             ViewPtr GetDefaultView();
             ConstViewPtr GetDefaultView() const;
 
@@ -99,6 +99,18 @@ namespace AZ
             //! Notifies consumers when the render scene has changed.
             void ConnectSceneChangedHandler(SceneChangedEvent::Handler& handler);
 
+            using PipelineChangedEvent = AZ::Event<RenderPipelinePtr>;
+            //! Notifies consumers when the current pipeline associated with our window has changed.
+            void ConnectCurrentPipelineChangedHandler(PipelineChangedEvent::Handler& handler);
+
+            using ViewChangedEvent = AZ::Event<ViewPtr>;
+            //! Notifies consumers when the default view has changed.
+            void ConnectDefaultViewChangedHandler(ViewChangedEvent::Handler& handler);
+
+            using ViewportIdEvent = AZ::Event<AzFramework::ViewportId>;
+            //! Notifies consumers when this ViewportContext is about to be destroyed.
+            void ConnectAboutToBeDestroyedHandler(ViewportIdEvent::Handler& handler);
+
             // ViewportRequestBus interface
             //! Gets the current camera's view matrix.
             const AZ::Matrix4x4& GetCameraViewMatrix() const override;
@@ -123,12 +135,17 @@ namespace AZ
             WindowContextSharedPtr m_windowContext;
             ViewPtr m_defaultView;
             AzFramework::WindowSize m_viewportSize;
+
             SizeChangedEvent m_sizeChangedEvent;
             MatrixChangedEvent m_viewMatrixChangedEvent;
             MatrixChangedEvent::Handler m_onViewMatrixChangedHandler;
             MatrixChangedEvent m_projectionMatrixChangedEvent;
             MatrixChangedEvent::Handler m_onProjectionMatrixChangedHandler;
             SceneChangedEvent m_sceneChangedEvent;
+            PipelineChangedEvent m_currentPipelineChangedEvent;
+            ViewChangedEvent m_defaultViewChangedEvent;
+            ViewportIdEvent m_aboutToBeDestroyedEvent;
+
             ViewportContextManager* m_manager;
             RenderPipelinePtr m_currentPipeline;
             Name m_name;
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 396ba14810..f372f40981 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
@@ -288,6 +288,7 @@ namespace AZ
             AZStd::size_t GetShaderCount() const;
             LuaMaterialFunctorShaderItem GetShader(AZStd::size_t index);
             LuaMaterialFunctorShaderItem GetShaderByTag(const char* shaderTag);
+            bool HasShaderWithTag(const char* shaderTag);
 
         private:
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
index aac81a6e26..376399ff84 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Edit/Shader/ShaderSourceData.cpp
@@ -11,6 +11,8 @@
 */
 
 #include <Atom/RPI.Edit/Shader/ShaderSourceData.h>
+#include <Atom/RHI.Edit/Utils.h>
+#include <Atom/RHI.Edit/ShaderCompilerArguments.h>
 #include <AzCore/std/string/regex.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
@@ -57,7 +59,7 @@ namespace AZ
 
         bool ShaderSourceData::IsRhiBackendDisabled(const AZ::Name& rhiName) const
         {
-            return AZStd::any_of(m_disabledRhiBackends.begin(), m_disabledRhiBackends.end(), [&](const AZStd::string& currentRhiName)
+            return AZStd::any_of(AZ_BEGIN_END(m_disabledRhiBackends), [&](const AZStd::string& currentRhiName)
                 {
                     return currentRhiName == rhiName.GetStringView();
                 });
@@ -72,19 +74,32 @@ namespace AZ
         static void GetListOfMacroDefinitionNames( 
             const AZStd::string& stringWithArguments, AZStd::vector<AZStd::string>& macroDefinitionNames)
         {
-            static const AZStd::regex macroRegex("-D\\s*(\\w+)", AZStd::regex::ECMAScript);
+            const AZStd::regex macroRegex(R"(-D\s*(\w+))", AZStd::regex::ECMAScript);
 
-            AZStd::cmatch match;
-            if (AZStd::regex_search(stringWithArguments.c_str(), match, macroRegex))
+            AZStd::string hayStack(stringWithArguments);
+            AZStd::smatch match;
+            while (AZStd::regex_search(hayStack.c_str(), match, macroRegex))
             {
                 // First pattern is always the entire string
                 for (unsigned i = 1; i < match.size(); ++i)
                 {
                     if (match[i].matched)
                     {
-                        macroDefinitionNames.push_back(match[i].str().c_str());
+                        AZStd::string macroToAdd(match[i].str().c_str());
+                        const bool isPresent = AZStd::any_of(AZ_BEGIN_END(macroDefinitionNames),
+                            [&](AZStd::string_view macroName) -> bool
+                            {
+                                return macroToAdd == macroName;
+                            }
+                        );
+                        if (isPresent)
+                        {
+                            continue;
+                        }
+                        macroDefinitionNames.push_back(macroToAdd);
                     }
                 }
+                hayStack = match.suffix();
             }
         }
 
@@ -103,19 +118,22 @@ namespace AZ
         static void GetListOfMacroDefinitions(
             const AZStd::string& stringWithArguments, AZStd::vector<AZStd::string>& macroDefinitions)
         {
-            static const AZStd::regex macroRegex("-D\\s*(\\w+(=\\w+)?)", AZStd::regex::ECMAScript);
+            const AZStd::regex macroRegex(R"(-D\s*(\w+)(=\w+)?)", AZStd::regex::ECMAScript);
 
-            AZStd::cmatch match;
-            if (AZStd::regex_search(stringWithArguments.c_str(), match, macroRegex))
+            AZStd::string hayStack(stringWithArguments);
+            AZStd::smatch match;
+            while (AZStd::regex_search(hayStack.c_str(), match, macroRegex))
             {
-                // First pattern is always the entire string
-                for (unsigned i = 1; i < match.size(); ++i)
+                if (match.size() > 1)
                 {
-                    if (match[i].matched)
+                    AZStd::string macro(match[1].str().c_str());
+                    if (match.size() > 2)
                     {
-                        macroDefinitions.push_back(match[i].str().c_str());
+                        macro += match[2].str().c_str();
                     }
+                    macroDefinitions.push_back(macro);
                 }
+                hayStack = match.suffix();
             }
         }
 
@@ -126,62 +144,27 @@ namespace AZ
             return parsedMacroDefinitions;
         }
 
-
-        // Helper.
-        // @arguments: A string with command line arguments for a console application of the form:
-        //             "-<arg1> --<arg2> --<arg3>[=<value3>] ..."
-        //             Example: "--use-spaces --namespace=vk"
-        // Returns: A list with just the [-|--]<argument name>:
-        //          ["-<arg1>", "--<arg2>", "--arg3"]
-        //          For the example shown above it will return this vector:
-        //          ["--use-spaces", "--namespace"]
-        AZStd::vector<AZStd::string> GetListOfArgumentNames(const AZStd::string& arguments)
-        {
-            AZStd::vector<AZStd::string> listOfTokens;
-            AzFramework::StringFunc::Tokenize(arguments, listOfTokens);
-            AZStd::vector<AZStd::string> listOfArguments;
-            for (const AZStd::string& token : listOfTokens)
-            {
-                AZStd::vector<AZStd::string> splitArguments;
-                AzFramework::StringFunc::Tokenize(token, splitArguments, "=");
-                listOfArguments.push_back(splitArguments[0]);
-            }
-            return listOfArguments;
-        }
-
         AZStd::string ShaderSourceData::SupervariantInfo::GetCustomizedArgumentsForAzslc(
             const AZStd::string& initialAzslcCompilerArguments) const
         {
-            static const AZStd::regex macroRegex("-D\\s*(\\w+(=\\S+)?)", AZStd::regex::ECMAScript);
+            const AZStd::regex macroRegex(R"(-D\s*(\w+(=\S+)?))", AZStd::regex::ECMAScript);
 
             // We are only concerned with AZSLc arguments. Let's remove the C-Preprocessor macro definitions
             // from @minusArguments.
             const AZStd::string minusArguments = AZStd::regex_replace(m_minusArguments, macroRegex, "");
             const AZStd::string plusArguments = AZStd::regex_replace(m_plusArguments, macroRegex, "");
             AZStd::string azslcArgumentsToRemove = minusArguments + " " + plusArguments;
-            AZStd::vector<AZStd::string> azslcArgumentNamesToRemove = GetListOfArgumentNames(azslcArgumentsToRemove);
+            AZStd::vector<AZStd::string> azslcArgumentNamesToRemove = RHI::CommandLineArgumentUtils::GetListOfArgumentNames(azslcArgumentsToRemove);
 
             // At this moment @azslcArgumentsToRemove contains arguments for AZSLc that can be of the form:
             // -<arg>
             // --<arg>[=<value>]
             // We need to remove those from @initialAzslcCompilerArguments.
-            AZStd::string customizedArguments = initialAzslcCompilerArguments;
-            for (const AZStd::string& azslcArgumentName : azslcArgumentNamesToRemove)
-            {
-                AZStd::string regexStr = AZStd::string::format("%s(=\\S+)?", azslcArgumentName.c_str());
-                AZStd::regex replaceRegex(regexStr, AZStd::regex::ECMAScript);
-                customizedArguments = AZStd::regex_replace(customizedArguments, replaceRegex, "");
-            }
-
+            AZStd::string customizedArguments = RHI::CommandLineArgumentUtils::RemoveArgumentsFromCommandLineString(
+                azslcArgumentNamesToRemove, initialAzslcCompilerArguments);
             customizedArguments += " " + plusArguments;
 
-            // Will contain the results that will be joined by a space.
-            // This is used to get a clean string to return without excess spaces.
-            AZStd::vector<AZStd::string> argumentList;
-            AzFramework::StringFunc::Tokenize(customizedArguments, argumentList, " \t\n");
-            customizedArguments.clear(); // Need to clear because Join appends.
-            AzFramework::StringFunc::Join(customizedArguments, argumentList.begin(), argumentList.end(), " ");
-            return customizedArguments;
+            return RHI::CommandLineArgumentUtils::RemoveExtraSpaces(customizedArguments);
         }
 
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
index b7ba7d4a32..4e4a7a5e71 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
@@ -211,6 +211,42 @@ namespace AZ
             m_rhiPipelineState = m_pipelineState->GetRHIPipelineState();
         }
 
+        void DynamicDrawContext::SetScene(Scene* scene)
+        {
+            AZ_Assert(scene, "SetScene called with an invalid scene");
+            if (!scene || m_scene == scene)
+            {
+                return;
+            }
+            m_scene = scene;
+            m_drawFilter = RHI::DrawFilterMaskDefaultValue;
+            // Reinitialize if it was initialized
+            if (m_initialized)
+            {
+                // Report warning if there were some draw data
+                AZ_Warning(
+                    "DynamicDrawContext", m_cachedDrawItems.size() == 0,
+                    "DynamicDrawContext::SetForScene should be called"
+                    " when there is no cached draw data");
+                // Clear some cached data
+                FrameEnd();
+                m_cachedRhiPipelineStates.clear();
+                // Reinitialize
+                EndInit();
+            }
+        }
+
+        void DynamicDrawContext::SetRenderPipeline(RenderPipeline* pipeline)
+        {
+            AZ_Assert(pipeline, "SetRenderPipeline called with an invalid pipeline");
+            if (!pipeline)
+            {
+                return;
+            }
+            SetScene(pipeline->GetScene());
+            m_drawFilter = pipeline->GetDrawFilterMask();
+        }
+
         bool DynamicDrawContext::IsReady()
         {
             return m_initialized;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
index 227e096594..1d6e8cdc65 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/Query.cpp
@@ -96,12 +96,6 @@ namespace AZ
                 return QueryResultCode::Fail;
             }
 
-            // Limit calling BeginQuery() to the first CommandList in the array.
-            if (context.GetCommandListIndex() != 0)
-            {
-                return QueryResultCode::Success;
-            }
-
             const auto rhiQueryIndices = GetRhiQueryIndicesFromCurrentFrame();
             if (!rhiQueryIndices)
             {
@@ -124,12 +118,6 @@ namespace AZ
                 return QueryResultCode::Fail;
             }
 
-            // Limit calling EndQuery() to the last CommandList in the array.
-            if (context.GetCommandListIndex() != context.GetCommandListCount() - 1)
-            {
-                return QueryResultCode::Success;
-            }
-
             // Validate that the queries are recorded for the same scope.
             if (m_cachedScopeId != context.GetScopeId())
             {
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
index d0a277304e..b1265b1228 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/MeshDrawPacket.cpp
@@ -169,7 +169,7 @@ namespace AZ
                 const AZ::Data::Asset<ShaderResourceGroupAsset>& drawSrgAsset = shader->GetAsset()->GetDrawSrgAsset();
 
                 // Set all unspecified shader options to default values, so that we get the most specialized variant possible.
-                // (because FindVariantStableId treats unspecified options as a request specificlly for a variant that doesn't specify those options)
+                // (because FindVariantStableId treats unspecified options as a request specifically for a variant that doesn't specify those options)
                 // [GFX TODO][ATOM-3883] We should consider updating the FindVariantStableId algorithm to handle default values for us, and remove this step here.
                 RPI::ShaderOptionGroup shaderOptions = *shaderItem.GetShaderOptions();
                 shaderOptions.SetUnspecifiedToDefaultValues();
@@ -198,6 +198,31 @@ namespace AZ
                 const ShaderVariantId finalVariantId = shaderOptions.GetShaderVariantId();
                 const ShaderVariant& variant = r_forceRootShaderVariantUsage ? shader->GetRootVariant() : shader->GetVariant(finalVariantId);
 
+                RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;
+                variant.ConfigurePipelineState(pipelineStateDescriptor);
+
+                // Render states need to merge the runtime variation.
+                // This allows materials to customize the render states that the shader uses.
+                const RHI::RenderStates& renderStatesOverlay = *shaderItem.GetRenderStatesOverlay();
+                RHI::MergeStateInto(renderStatesOverlay, pipelineStateDescriptor.m_renderStates);
+
+                streamBufferViewsPerShader.push_back();
+                auto& streamBufferViews = streamBufferViewsPerShader.back();
+
+                UvStreamTangentBitmask uvStreamTangentBitmask;
+
+                if (!m_modelLod->GetStreamsForMesh(
+                    pipelineStateDescriptor.m_inputStreamLayout,
+                    streamBufferViews,
+                    &uvStreamTangentBitmask,
+                    variant.GetInputContract(),
+                    m_modelLodMeshIndex,
+                    m_materialModelUvMap,
+                    m_material->GetAsset()->GetMaterialTypeAsset()->GetUvNameMap()))
+                {
+                    return false;
+                }
+
                 Data::Instance<ShaderResourceGroup> drawSrg;
                 if (drawSrgAsset)
                 {
@@ -210,31 +235,20 @@ namespace AZ
                         drawSrg->SetShaderVariantKeyFallbackValue(shaderOptions.GetShaderVariantKeyFallbackValue());
                     }
 
+                    // Pass UvStreamTangentBitmask to the shader if the draw SRG has it.
+                    {
+                        AZ::Name shaderUvStreamTangentBitmask = AZ::Name(UvStreamTangentBitmask::SrgName);
+                        auto index = drawSrg->FindShaderInputConstantIndex(shaderUvStreamTangentBitmask);
+
+                        if (index.IsValid())
+                        {
+                            drawSrg->SetConstant(index, uvStreamTangentBitmask.GetFullTangentBitmask());
+                        }
+                    }
+
                     drawSrg->Compile();
                 }
 
-                RHI::PipelineStateDescriptorForDraw pipelineStateDescriptor;
-                variant.ConfigurePipelineState(pipelineStateDescriptor);
-
-                // Render states need to merge the runtime variation.
-                // This allows materials to customize the render states that the shader uses.
-                const RHI::RenderStates& renderStatesOverlay = *shaderItem.GetRenderStatesOverlay();
-                RHI::MergeStateInto(renderStatesOverlay, pipelineStateDescriptor.m_renderStates);
-
-                streamBufferViewsPerShader.push_back();
-                auto& streamBufferViews = streamBufferViewsPerShader.back();
-
-                if (!m_modelLod->GetStreamsForMesh(
-                    pipelineStateDescriptor.m_inputStreamLayout,
-                    streamBufferViews,
-                    variant.GetInputContract(),
-                    m_modelLodMeshIndex,
-                    m_materialModelUvMap,
-                    m_material->GetAsset()->GetMaterialTypeAsset()->GetUvNameMap()))
-                {
-                    return false;
-                }
-
                 // Use the default draw list tag from the shader variant.
                 RHI::DrawListTag drawListTag = shader->GetDrawListTag();
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
index 8747dac663..c6a1a51f39 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp
@@ -117,6 +117,17 @@ namespace AZ
             return RHI::ResultCode::Success;
         }
 
+        ModelLod::StreamInfoList::const_iterator ModelLod::FindFirstUvStreamFromMesh(size_t meshIndex) const
+        {
+            const Mesh& mesh = m_meshes[meshIndex];
+
+            auto firstUv = AZStd::find_if(mesh.m_streamInfo.begin(), mesh.m_streamInfo.end(), [](const StreamBufferInfo& info) {
+                return info.m_semantic.m_name.GetStringView().starts_with(RHI::ShaderSemantic::UvStreamSemantic);
+            });
+
+            return firstUv;
+        }
+
         ModelLod::StreamInfoList::const_iterator ModelLod::FindDefaultUvStream(size_t meshIndex, const MaterialUvNameMap& materialUvNameMap) const
         {
             const Mesh& mesh = m_meshes[meshIndex];
@@ -160,7 +171,9 @@ namespace AZ
             const MaterialModelUvOverrideMap& materialModelUvMap,
             const MaterialUvNameMap& materialUvNameMap,
             const ShaderInputContract::StreamChannelInfo& contractStreamChannel,
-            StreamInfoList::const_iterator defaultUv) const
+            StreamInfoList::const_iterator defaultUv,
+            StreamInfoList::const_iterator firstUv,
+            UvStreamTangentBitmask* uvStreamTangentBitmaskOut) const
         {
             const Mesh& mesh = m_meshes[meshIndex];
             auto iter = mesh.m_streamInfo.end();
@@ -184,8 +197,8 @@ namespace AZ
                     // Cost of linear search UV names is low because the size is extremely limited.
                     return uvNamePair.m_shaderInput == contractStreamChannel.m_semantic;
                 });
-            const bool IsUv = materialUvIter != materialUvNameMap.end();
-            if (IsUv)
+            const bool isUv = materialUvIter != materialUvNameMap.end();
+            if (isUv)
             {
                 const AZ::Name& materialUvName = materialUvIter->m_uvName;
                 auto modelUvMapIter = materialModelUvMap.find(materialUvIter->m_shaderInput);
@@ -224,17 +237,23 @@ namespace AZ
                     });
             }
 
-            if (iter == mesh.m_streamInfo.end() && IsUv)
+            if (iter == mesh.m_streamInfo.end() && isUv)
             {
                 iter = defaultUv;
             }
 
+            if (isUv && uvStreamTangentBitmaskOut)
+            {
+                uvStreamTangentBitmaskOut->ApplyTangent(iter == firstUv ? 0 : UvStreamTangentBitmask::UnassignedTangent);
+            }
+
             return iter;
         }
 
         bool ModelLod::GetStreamsForMesh(
             RHI::InputStreamLayout& layoutOut,
             StreamBufferViewList& streamBufferViewsOut,
+            UvStreamTangentBitmask* uvStreamTangentBitmaskOut,
             const ShaderInputContract& contract,
             size_t meshIndex,
             const MaterialModelUvOverrideMap& materialModelUvMap,
@@ -250,11 +269,17 @@ namespace AZ
 
             bool success = true;
 
+            // Searching for the first UV in the mesh, so it can be used to paired with tangent/bitangent stream
+            auto firstUv = FindFirstUvStreamFromMesh(meshIndex);
             auto defaultUv = FindDefaultUvStream(meshIndex, materialUvNameMap);
+            if (uvStreamTangentBitmaskOut)
+            {
+                uvStreamTangentBitmaskOut->Reset();
+            }
 
             for (auto& contractStreamChannel : contract.m_streamChannels)
             {
-                auto iter = FindMatchingStream(meshIndex, materialModelUvMap, materialUvNameMap, contractStreamChannel, defaultUv);
+                auto iter = FindMatchingStream(meshIndex, materialModelUvMap, materialUvNameMap, contractStreamChannel, defaultUv, firstUv, uvStreamTangentBitmaskOut);
 
                 if (iter == mesh.m_streamInfo.end())
                 {
@@ -340,6 +365,7 @@ namespace AZ
             const Mesh& mesh = m_meshes[meshIndex];
 
             auto defaultUv = FindDefaultUvStream(meshIndex, materialUvNameMap);
+            auto firstUv = FindFirstUvStreamFromMesh(meshIndex);
 
             for (auto& contractStreamChannel : contract.m_streamChannels)
             {
@@ -350,7 +376,7 @@ namespace AZ
 
                 AZ_Assert(contractStreamChannel.m_streamBoundIndicatorIndex.IsValid(), "m_streamBoundIndicatorIndex was invalid for an optional shader input stream");
 
-                auto iter = FindMatchingStream(meshIndex, materialModelUvMap, materialUvNameMap, contractStreamChannel, defaultUv);
+                auto iter = FindMatchingStream(meshIndex, materialModelUvMap, materialUvNameMap, contractStreamChannel, defaultUv, firstUv, nullptr);
 
                 ShaderOptionValue isStreamBound = (iter == mesh.m_streamInfo.end()) ? ShaderOptionValue{0} : ShaderOptionValue{1};
                 shaderOptions.SetValue(contractStreamChannel.m_streamBoundIndicatorIndex, isStreamBound);
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
new file mode 100644
index 0000000000..829207e406
--- /dev/null
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
@@ -0,0 +1,71 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <Atom/RPI.Public/Model/UvStreamTangentBitmask.h>
+#include <AzCore/Debug/Trace.h>
+
+namespace AZ
+{
+    namespace RPI
+    {
+        uint32_t UvStreamTangentBitmask::GetFullTangentBitmask() const
+        {
+            return m_mask;
+        }
+
+        uint32_t UvStreamTangentBitmask::GetUvStreamCount() const
+        {
+            return m_mask >> (sizeof(m_mask) * CHAR_BIT - BitsForUvIndex);
+        }
+
+        uint32_t UvStreamTangentBitmask::GetTangentAtUv(uint32_t uvIndex) const
+        {
+            return (m_mask >> (BitsPerTangent * uvIndex)) & 0b1111u;
+        }
+
+        void UvStreamTangentBitmask::ApplyTangent(uint32_t tangentIndex)
+        {
+            uint32_t currentSlot = GetUvStreamCount();
+            if (currentSlot >= MaxUvSlots)
+            {
+                AZ_Error("UV Stream", false, "Reaching the max of avaiblable stream slots.");
+                return;
+            }
+
+            if (tangentIndex > UnassignedTangent)
+            {
+                AZ_Warning(
+                    "UV Stream", false,
+                    "Tangent index must use %d bits as defined in UvStreamTangentIndex::m_flag. Unassigned index will be applied.",
+                    BitsPerTangent);
+                tangentIndex = UnassignedTangent;
+            }
+
+            uint32_t clearMask = 0b1111u << (BitsPerTangent * currentSlot);
+            clearMask = ~clearMask;
+
+            // Clear the writing bits in case
+            m_mask &= clearMask;
+
+            // Write the bits to the slot
+            m_mask |= (tangentIndex << (BitsPerTangent * currentSlot));
+
+            // Increase the index
+            m_mask += (1u << (sizeof(m_mask) * CHAR_BIT - BitsForUvIndex));
+        }
+
+        void UvStreamTangentBitmask::Reset()
+        {
+            m_mask = 0;
+        }
+    }
+}
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
index 9c6a95e582..3a2a556429 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/RenderPass.cpp
@@ -522,8 +522,11 @@ namespace AZ
                 }
             };
 
-            ExecuteOnTimestampQuery(beginQuery);
-            ExecuteOnPipelineStatisticsQuery(beginQuery);
+            if (context.GetCommandListIndex() == 0)
+            {
+                ExecuteOnTimestampQuery(beginQuery);
+                ExecuteOnPipelineStatisticsQuery(beginQuery);
+            }
         }
 
         void RenderPass::EndScopeQuery(const RHI::FrameGraphExecuteContext& context)
@@ -533,8 +536,23 @@ namespace AZ
                 query->EndQuery(context);
             };
 
-            ExecuteOnTimestampQuery(endQuery);
-            ExecuteOnPipelineStatisticsQuery(endQuery);
+            // This scopy query implmentation should be replaced by
+            // [ATOM-5407] [RHI][Core] - Add GPU timestamp and pipeline statistic support for scopes
+            
+            // For timestamp query, it's okay to execute across different command lists
+            if (context.GetCommandListIndex() == context.GetCommandListCount() - 1)
+            {
+                ExecuteOnTimestampQuery(endQuery);
+            }
+            // For all the other types of queries except timestamp, the query start and end has to be in the same command list
+            // Here only tracks the PipelineStatistics for the first command list due to that we don't know how many queries are
+            // needed when AddScopeQueryToFrameGraph is called.
+            // This implementation leads to an issue that we may not get accurate pipeline statistic data
+            // for passes which were executed with more than one command list
+            if (context.GetCommandListIndex() == 0)
+            {
+                ExecuteOnPipelineStatisticsQuery(endQuery);
+            }
         }
 
         void RenderPass::ReadbackScopeQueryResults()
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
index 6579e6a98d..3fc2bbd197 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderVariantAsyncLoader.cpp
@@ -150,10 +150,7 @@ namespace AZ
                     }
                 }
 
-                if (!shaderVariantTreePendingRequests.empty() || !shaderVariantPendingRequests.empty())
-                {
-                    AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(1000));
-                }
+                AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(1000));
             }
         }
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
index 22287238e9..08f8ff0c5e 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/ViewportContext.cpp
@@ -51,6 +51,8 @@ namespace AZ
 
         ViewportContext::~ViewportContext()
         {
+            m_aboutToBeDestroyedEvent.Signal(m_id);
+
             AzFramework::WindowNotificationBus::Handler::BusDisconnect();
             AzFramework::ViewportRequestBus::Handler::BusDisconnect();
 
@@ -171,6 +173,21 @@ namespace AZ
             handler.Connect(m_sceneChangedEvent);
         }
 
+        void ViewportContext::ConnectCurrentPipelineChangedHandler(PipelineChangedEvent::Handler& handler)
+        {
+            handler.Connect(m_currentPipelineChangedEvent);
+        }
+
+        void ViewportContext::ConnectDefaultViewChangedHandler(ViewChangedEvent::Handler& handler)
+        {
+            handler.Connect(m_defaultViewChangedEvent);
+        }
+
+        void ViewportContext::ConnectAboutToBeDestroyedHandler(ViewportIdEvent::Handler& handler)
+        {
+            handler.Connect(m_aboutToBeDestroyedEvent);
+        }
+
         const AZ::Matrix4x4& ViewportContext::GetCameraViewMatrix() const
         {
             return GetDefaultView()->GetWorldToViewMatrix();
@@ -214,6 +231,7 @@ namespace AZ
                 m_defaultView = view;
                 UpdatePipelineView();
 
+                m_defaultViewChangedEvent.Signal(view);
                 m_viewMatrixChangedEvent.Signal(view->GetWorldToViewMatrix());
                 m_projectionMatrixChangedEvent.Signal(view->GetViewToClipMatrix());
 
@@ -232,6 +250,7 @@ namespace AZ
             if (!m_currentPipeline)
             {
                 m_currentPipeline = m_rootScene ? m_rootScene->FindRenderPipelineForWindow(m_windowContext->GetWindowHandle()) : nullptr;
+                m_currentPipelineChangedEvent.Signal(m_currentPipeline);
             }
 
             if (auto pipeline = GetCurrentPipeline())
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 7db5f12560..d6421e1337 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp
@@ -296,6 +296,7 @@ namespace AZ
                 ->Method("GetShaderCount", &LuaMaterialFunctorRuntimeContext::GetShaderCount)
                 ->Method("GetShader", &LuaMaterialFunctorRuntimeContext::GetShader)
                 ->Method("GetShaderByTag", &LuaMaterialFunctorRuntimeContext::GetShaderByTag)
+                ->Method("HasShaderWithTag", &LuaMaterialFunctorRuntimeContext::HasShaderWithTag)
                 ;
         }
 
@@ -424,6 +425,11 @@ namespace AZ
                 return LuaMaterialFunctorShaderItem{nullptr};
             }
         }
+        
+        bool LuaMaterialFunctorRuntimeContext::HasShaderWithTag(const char* shaderTag)
+        {
+            return m_runtimeContextImpl->m_shaderCollection->HasShaderTag(AZ::Name{shaderTag});
+        }
 
         void LuaMaterialFunctorEditorContext::LuaMaterialFunctorEditorContext::Reflect(BehaviorContext* behaviorContext)
         {
diff --git a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
index 84e8a4ba65..6b9c503ec2 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.cpp
@@ -72,7 +72,15 @@ namespace UnitTest
         return false;
     }
 
-    bool AssetSystemStub::GetFullSourcePathFromRelativeProductPath([[maybe_unused]] const AZStd::string& relPath, [[maybe_unused]] AZStd::string& fullSourcePath)
+    bool AssetSystemStub::GenerateRelativeSourcePath(
+        [[maybe_unused]] const AZStd::string& sourcePath, [[maybe_unused]] AZStd::string& relativePath,
+        [[maybe_unused]] AZStd::string& watchFolder)
+    {
+        return false;
+    }
+
+    bool AssetSystemStub::GetFullSourcePathFromRelativeProductPath(
+        [[maybe_unused]] const AZStd::string& relPath, [[maybe_unused]] AZStd::string& fullSourcePath)
     {
         return false;
     }
diff --git a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
index c6f4ac891f..48609ed0cb 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetSystemStub.h
@@ -63,6 +63,8 @@ namespace UnitTest
         const char* GetAbsoluteDevGameFolderPath() override;
         const char* GetAbsoluteDevRootFolderPath() override;
         bool GetRelativeProductPathFromFullSourceOrProductPath(const AZStd::string& fullPath, AZStd::string& relativeProductPath) override;
+        bool GenerateRelativeSourcePath(
+            const AZStd::string& sourcePath, AZStd::string& relativePath, AZStd::string& watchFolder) override;
         bool GetFullSourcePathFromRelativeProductPath(const AZStd::string& relPath, AZStd::string& fullSourcePath) override;
         bool GetAssetInfoById(const AZ::Data::AssetId& assetId, const AZ::Data::AssetType& assetType, const AZStd::string& platformName, AZ::Data::AssetInfo& assetInfo, AZStd::string& rootFilePath) override;
         bool GetSourceInfoBySourceUUID(const AZ::Uuid& sourceUuid, AZ::Data::AssetInfo& assetInfo, AZStd::string& watchFolder) override;
diff --git a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
index 980a9ac320..1ec14c6169 100644
--- a/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/Model/ModelTests.cpp
@@ -17,6 +17,7 @@
 #include <Atom/RPI.Reflect/Model/ModelKdTree.h>
 #include <Atom/RPI.Reflect/Model/ModelLodAsset.h>
 #include <Atom/RPI.Reflect/ResourcePoolAssetCreator.h>
+#include <Atom/RPI.Public/Model/UvStreamTangentBitmask.h>
 
 #include <AzCore/std/limits.h>
 #include <AzCore/Component/Entity.h>
@@ -917,6 +918,43 @@ namespace UnitTest
         }
     }
 
+    TEST_F(ModelTests, UvStream)
+    {
+        AZ::RPI::UvStreamTangentBitmask uvStreamTangentBitmask;
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0u);
+
+        uvStreamTangentBitmask.ApplyTangent(1u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(0u), 1u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x10000001);
+        EXPECT_EQ(uvStreamTangentBitmask.GetUvStreamCount(), 1u);
+
+        uvStreamTangentBitmask.ApplyTangent(5u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(0u), 1u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(1u), 5u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x20000051);
+        EXPECT_EQ(uvStreamTangentBitmask.GetUvStreamCount(), 2u);
+
+        uvStreamTangentBitmask.ApplyTangent(100u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(0u), 1u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(1u), 5u);
+        EXPECT_EQ(uvStreamTangentBitmask.GetTangentAtUv(2u), AZ::RPI::UvStreamTangentBitmask::UnassignedTangent);
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x30000F51);
+        EXPECT_EQ(uvStreamTangentBitmask.GetUvStreamCount(), 3u);
+
+        for (uint32_t i = 3; i < AZ::RPI::UvStreamTangentBitmask::MaxUvSlots; ++i)
+        {
+            uvStreamTangentBitmask.ApplyTangent(0u);
+        }
+
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x70000F51);
+
+        AZ_TEST_START_TRACE_SUPPRESSION;
+        uvStreamTangentBitmask.ApplyTangent(0u);
+        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
+
+        EXPECT_EQ(uvStreamTangentBitmask.GetFullTangentBitmask(), 0x70000F51);
+    }
+
     // This class creates a Model with one LOD, whose mesh contains 2 planes. Plane 1 is in the XY plane at Z=-0.5, and
     // plane 2 is in the XY plane at Z=0.5. The two planes each have 9 quads which have been triangulated. It only has
     // a position and index buffer.
diff --git a/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp b/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
index e55ec8012b..98ff6befdd 100644
--- a/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
+++ b/Gems/Atom/RPI/Code/Tests/System/GpuQueryTests.cpp
@@ -159,7 +159,9 @@ namespace UnitTest
         const uint32_t ResultSize = sizeof(uint64_t);
 
         uint64_t mockData;
-        const RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        uint64_t dummyCommandList;
+        desc.m_commandList = reinterpret_cast<RHI::CommandList*>(&dummyCommandList);
         RHI::FrameGraphExecuteContext context(desc);
 
         RHI::Scope scope;
@@ -209,7 +211,9 @@ namespace UnitTest
         const uint32_t ResultSize = sizeof(uint64_t) * 4u;
 
         uint64_t mockData;
-        const RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        uint64_t dummyCommandList;
+        desc.m_commandList = reinterpret_cast<RHI::CommandList*>(&dummyCommandList);
         RHI::FrameGraphExecuteContext context(desc);
 
         RHI::Scope scope;
@@ -273,7 +277,9 @@ namespace UnitTest
         const uint32_t ResultSize = sizeof(uint64_t) * 2u;
 
         uint64_t mockData;
-        const RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        RHI::FrameGraphExecuteContext::Descriptor desc = {};
+        uint64_t dummyCommandList;
+        desc.m_commandList = reinterpret_cast<RHI::CommandList*>(&dummyCommandList);
         RHI::FrameGraphExecuteContext context(desc);
 
         RHI::Scope scope;
diff --git a/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake b/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
index 0d5c19758b..6242f3f140 100644
--- a/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
+++ b/Gems/Atom/RPI/Code/atom_rpi_public_files.cmake
@@ -57,6 +57,7 @@ set(FILES
     Include/Atom/RPI.Public/Model/ModelLod.h
     Include/Atom/RPI.Public/Model/ModelLodUtils.h
     Include/Atom/RPI.Public/Model/ModelSystem.h
+    Include/Atom/RPI.Public/Model/UvStreamTangentBitmask.h
     Include/Atom/RPI.Public/Pass/AttachmentReadback.h
     Include/Atom/RPI.Public/Pass/ComputePass.h
     Include/Atom/RPI.Public/Pass/CopyPass.h
@@ -136,6 +137,7 @@ set(FILES
     Source/RPI.Public/Model/ModelLod.cpp
     Source/RPI.Public/Model/ModelLodUtils.cpp
     Source/RPI.Public/Model/ModelSystem.cpp
+    Source/RPI.Public/Model/UvStreamTangentBitmask.cpp
     Source/RPI.Public/Pass/AttachmentReadback.cpp
     Source/RPI.Public/Pass/ComputePass.cpp
     Source/RPI.Public/Pass/CopyPass.cpp
diff --git a/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material b/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material
index 4c3a925e52..c9276216eb 100644
--- a/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material
+++ b/Gems/Atom/TestData/TestData/Materials/ParallaxRock.material
@@ -17,7 +17,6 @@
             "textureMap": "TestData/Textures/cc0/Rock030_2K_Normal.jpg"
         },
         "parallax": {
-            "enable": true,
             "algorithm": "POM",
             "factor": 0.03,
             "quality": "High",
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material
index d9a4aabe2a..415bd36dcf 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/001_ManyFeatures.material
@@ -36,7 +36,6 @@
             "diffuseTextureMap": "TestData/Textures/cc0/bark1_disp.jpg"
         },
         "layer1_parallax": {
-            "enable": true,
             "factor": 0.02500000037252903,
             "textureMap": "TestData/Textures/cc0/bark1_disp.jpg"
         },
@@ -80,7 +79,6 @@
             "specularTextureMap": "TestData/Textures/cc0/Tiles009_1K_Displacement.jpg"
         },
         "layer2_parallax": {
-            "enable": true,
             "factor": 0.01600000075995922,
             "textureMap": "TestData/Textures/cc0/Lava004_1K_Displacement.jpg"
         },
@@ -88,6 +86,10 @@
             "textureMap": "TestData/Textures/cc0/Lava004_1K_Roughness.jpg"
         },
         "layer2_uv": {
+            "center": [
+                0.0,
+                0.0
+            ],
             "offsetU": 0.5,
             "offsetV": 0.25
         },
@@ -118,7 +120,6 @@
             "diffuseTextureMap": "TestData/Textures/cc0/PaintedMetal003_1K_Displacement.jpg"
         },
         "layer3_parallax": {
-            "enable": true,
             "factor": 0.004999999888241291,
             "textureMap": "TestData/Textures/cc0/PaintedMetal003_1K_Displacement.jpg"
         },
@@ -131,11 +132,15 @@
             "factor": 0.47474750876426699
         },
         "layer3_uv": {
+            "center": [
+                0.0,
+                0.0
+            ],
             "offsetU": 0.11999999731779099,
             "rotateDegrees": -57.599998474121097
         },
         "parallax": {
-            "enable": true
+            "quality": "Medium"
         },
         "uv": {
             "center": [
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material
index 0bf4177db9..64adf317a9 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material
@@ -15,7 +15,6 @@
             "textureMap": "TestData/Textures/cc0/bark1_norm.jpg"
         },
         "layer1_parallax": {
-            "enable": true,
             "factor": 0.03999999910593033,
             "textureMap": "TestData/Textures/cc0/bark1_disp.jpg"
         },
@@ -32,7 +31,6 @@
             "textureMap": "TestData/Textures/cc0/Rock030_2K_Normal.jpg"
         },
         "layer2_parallax": {
-            "enable": true,
             "factor": 0.05299999937415123,
             "offset": -0.024000000208616258,
             "textureMap": "TestData/Textures/cc0/Rock030_2K_Displacement.jpg"
@@ -50,8 +48,8 @@
             "textureMap": "TestData/Textures/cc0/Concrete019_1K_Color.jpg"
         },
         "parallax": {
-            "enable": true,
-            "pdo": true
+            "pdo": true,
+            "quality": "Medium"
         }
     }
 }
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_DepthMaps.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
similarity index 81%
rename from Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_DepthMaps.material
rename to Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
index d41e116067..ffcbf3ce7e 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_DepthMaps.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendMask.material
@@ -4,8 +4,8 @@
     "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
     "propertyLayoutVersion": 3,
     "properties": {
-        "general": {
-            "debugDrawMode": "DepthMaps"
+        "blend": {
+            "debugDrawMode": "BlendMask"
         }
     }
 }
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
new file mode 100644
index 0000000000..8d13ac781f
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendWeights.material
@@ -0,0 +1,11 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "debugDrawMode": "FinalBlendWeights"
+        }
+    }
+}
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendSource.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
similarity index 80%
rename from Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendSource.material
rename to Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
index cdd21212c9..7aff50cb56 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_BlendSource.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/003_Debug_Displacement.material
@@ -4,8 +4,8 @@
     "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/002_ParallaxPdo.material",
     "propertyLayoutVersion": 3,
     "properties": {
-        "general": {
-            "debugDrawMode": "BlendSource"
+        "blend": {
+            "debugDrawMode": "Displacement"
         }
     }
 }
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material
index ea3ffab467..ea3ea8b519 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/004_UseVertexColors.material
@@ -5,7 +5,10 @@
     "propertyLayoutVersion": 3,
     "properties": {
         "blend": {
-            "blendSource": "VertexColors"
+            "blendSource": "BlendMaskVertexColors"
+        },
+        "parallax": {
+            "quality": "Medium"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material
new file mode 100644
index 0000000000..9163fe0a0c
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material
@@ -0,0 +1,81 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "blendSource": "Displacement",
+            "displacementBlendDistance": 0.008999999612569809,
+            "enableLayer2": true,
+            "enableLayer3": true
+        },
+        "layer1_baseColor": {
+            "textureMap": "TestData/Textures/cc0/Ground033_1K_Color.jpg"
+        },
+        "layer1_normal": {
+            "textureMap": "TestData/Textures/cc0/Ground033_1K_Normal.jpg"
+        },
+        "layer1_occlusion": {
+            "diffuseTextureMap": "TestData/Textures/cc0/Ground033_1K_AmbientOcclusion.jpg"
+        },
+        "layer1_parallax": {
+            "factor": 0.017000000923871995,
+            "offset": -0.006000000052154064,
+            "textureMap": "TestData/Textures/cc0/Ground033_1K_Displacement.jpg"
+        },
+        "layer1_roughness": {
+            "textureMap": "TestData/Textures/cc0/Ground033_1K_Roughness.jpg"
+        },
+        "layer2_baseColor": {
+            "textureMap": "TestData/Textures/cc0/Rock030_2K_Color.jpg"
+        },
+        "layer2_normal": {
+            "textureMap": "TestData/Textures/cc0/Rock030_2K_Normal.jpg"
+        },
+        "layer2_occlusion": {
+            "diffuseTextureMap": "TestData/Textures/cc0/Rocks002_1K_AmbientOcclusion.jpg"
+        },
+        "layer2_parallax": {
+            "factor": 0.03099999949336052,
+            "offset": 0.0020000000949949028,
+            "textureMap": "TestData/Textures/cc0/Rock030_2K_Displacement.jpg"
+        },
+        "layer2_roughness": {
+            "textureMap": "TestData/Textures/cc0/Rock030_2K_Roughness.jpg"
+        },
+        "layer2_uv": {
+            "center": [
+                0.0,
+                0.0
+            ],
+            "offsetU": 0.1599999964237213,
+            "offsetV": 0.07999999821186066,
+            "rotateDegrees": 90.0
+        },
+        "layer3_baseColor": {
+            "textureMap": "TestData/Textures/cc0/Rocks002_1K_Color.jpg"
+        },
+        "layer3_normal": {
+            "textureMap": "TestData/Textures/cc0/Rocks002_1K_Normal.jpg"
+        },
+        "layer3_parallax": {
+            "factor": 0.027000000700354577,
+            "textureMap": "TestData/Textures/cc0/Rocks002_1K_Displacement.jpg"
+        },
+        "layer3_roughness": {
+            "textureMap": "TestData/Textures/cc0/Rocks002_1K_Roughness.jpg"
+        },
+        "layer3_uv": {
+            "center": [
+                0.0,
+                0.0
+            ],
+            "scale": 3.4999988079071047
+        },
+        "parallax": {
+            "algorithm": "Relief",
+            "pdo": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material
new file mode 100644
index 0000000000..9413e35128
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer2Off.material
@@ -0,0 +1,11 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "enableLayer2": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material
new file mode 100644
index 0000000000..93e0b21780
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_Layer3Off.material
@@ -0,0 +1,11 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "enableLayer3": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material
new file mode 100644
index 0000000000..6b062f6d1e
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material
@@ -0,0 +1,14 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "blendSource": "Displacement_With_BlendMaskTexture"
+        },
+        "layer1_parallax": {
+            "offset": -0.004000000189989805
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material
new file mode 100644
index 0000000000..0e6519afd4
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_AllSameHeight.material
@@ -0,0 +1,23 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "displacementBlendDistance": 0.0010000000474974514
+        },
+        "layer1_parallax": {
+            "offset": -0.00800000037997961,
+            "textureMap": ""
+        },
+        "layer2_parallax": {
+            "offset": -0.00800000037997961,
+            "textureMap": ""
+        },
+        "layer3_parallax": {
+            "offset": -0.00800000037997961,
+            "textureMap": ""
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material
new file mode 100644
index 0000000000..b5b5656084
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture_NoHeightmaps.material
@@ -0,0 +1,20 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskTexture.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "layer1_parallax": {
+            "offset": -0.03200000151991844,
+            "textureMap": ""
+        },
+        "layer2_parallax": {
+            "offset": -0.00800000037997961,
+            "textureMap": ""
+        },
+        "layer3_parallax": {
+            "offset": -0.00800000037997961,
+            "textureMap": ""
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material
new file mode 100644
index 0000000000..8461ea429c
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement_With_BlendMaskVertexColors.material
@@ -0,0 +1,15 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardMultilayerPBR.materialtype",
+    "parentMaterial": "TestData/Materials/StandardMultilayerPbrTestCases/005_UseDisplacement.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "blend": {
+            "blendSource": "Displacement_With_BlendMaskVertexColors",
+            "displacementBlendDistance": 0.02387000061571598
+        },
+        "parallax": {
+            "enable": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material
new file mode 100644
index 0000000000..1716792af1
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/009_Opacity_TintedTransparent.material
@@ -0,0 +1,23 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "parentMaterial": "",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "baseColor": {
+            "color": [
+                0.5906767249107361,
+                1.0,
+                0.11703670024871826,
+                1.0
+            ],
+            "textureMap": "Textures/Default/default_basecolor.tif"
+        },
+        "opacity": {
+            "alphaSource": "Split",
+            "factor": 0.75,
+            "mode": "TintedTransparent",
+            "textureMap": "TestData/Textures/checker8x8_gray_512.png"
+        }
+    }
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material
index a94d90d04d..ed070d5de2 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM.material
@@ -8,7 +8,6 @@
         },
         "parallax": {
             "algorithm": "POM",
-            "enable": true,
             "factor": 0.02500000037252903,
             "quality": "High",
             "textureMap": "TestData/Textures/TextureHaven/4k_castle_brick_02_red/4k_castle_brick_02_red_disp.png"
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material
index fb862dc5d3..f5ec0e8287 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/012_Parallax_POM_Cutout.material
@@ -13,13 +13,15 @@
             "textureMap": "TestData/Textures/checker8x8_512.png"
         },
         "parallax": {
-            "algorithm": "POM",
-            "enable": true,
             "factor": 0.10000000149011612,
             "quality": "High",
             "textureMap": "TestData/Textures/TextureHaven/4k_castle_brick_02_red/4k_castle_brick_02_red_disp.png"
         },
         "uv": {
+            "center": [
+                0.0,
+                0.0
+            ],
             "scale": 0.5
         }
     }
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
index dbaf6cb587..38adbc70cd 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/015_SubsurfaceScattering_Transmission.material
@@ -6,7 +6,6 @@
     "properties": {
         "subsurfaceScattering": {
             "enableSubsurfaceScattering": true,
-            "enableTransmission": true,
             "scatterDistance": 64.6464614868164,
             "subsurfaceScatterFactor": 1.0,
             "thicknessMap": "TestData/Textures/checker8x8_512.png",
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material
index 7bf12e5358..b3e69212db 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_A.material
@@ -13,7 +13,6 @@
         },
         "parallax": {
             "algorithm": "POM",
-            "enable": true,
             "factor": 0.10000000149011612,
             "quality": "High",
             "textureMap": "TestData/Objects/cube/cube_diff.tif"
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material
index 4b9f233a85..3d52f3b9e6 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/100_UvTiling_Parallax_B.material
@@ -13,7 +13,6 @@
         },
         "parallax": {
             "algorithm": "POM",
-            "enable": true,
             "factor": 0.05000000074505806,
             "quality": "High",
             "textureMap": "TestData/Objects/cube/cube_diff.tif"
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_LucyBaseNoDetailMaps.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_LucyBaseNoDetailMaps.material
index 7b1f0ba6a9..6d77be5a49 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_LucyBaseNoDetailMaps.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/101_DetailMaps_LucyBaseNoDetailMaps.material
@@ -8,18 +8,24 @@
             "textureMap": "Objects/Lucy/Lucy_bronze_BaseColor.png",
             "textureMapUv": "Unwrapped"
         },
+        "detailUV": {
+            "center": [
+                0.0,
+                0.0
+            ]
+        },
         "metallic": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_metallic.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Metallic.png",
             "textureMapUv": "Unwrapped"
         },
         "normal": {
             "flipY": true,
-            "textureMap": "Objects/Lucy/Lucy_normal.png",
+            "textureMap": "Objects/Lucy/Lucy_Normal.png",
             "textureMapUv": "Unwrapped"
         },
         "roughness": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_roughness.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Roughness.png",
             "textureMapUv": "Unwrapped"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material
index 55a01866b5..1a29f392c8 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/102_DetailMaps_All.material
@@ -5,7 +5,7 @@
     "propertyLayoutVersion": 3,
     "properties": {
         "baseColor": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_baseColor.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_BaseColor.png",
             "textureMapUv": "Unwrapped"
         },
         "detailLayerGroup": {
@@ -19,20 +19,24 @@
             "normalDetailStrength": 1.5
         },
         "detailUV": {
+            "center": [
+                0.0,
+                0.0
+            ],
             "scale": 10.0
         },
         "metallic": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_metallic.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Metallic.png",
             "textureMapUv": "Unwrapped"
         },
         "normal": {
             "flipY": true,
-            "textureMap": "Objects/Lucy/Lucy_normal.png",
+            "textureMap": "Objects/Lucy/Lucy_Normal.png",
             "textureMapUv": "Unwrapped"
         },
         "roughness": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_roughness.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Roughness.png",
             "textureMapUv": "Unwrapped"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material
index 6193cf4eed..a69b72b623 100644
--- a/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material
+++ b/Gems/Atom/TestData/TestData/Materials/StandardPbrTestCases/105_DetailMaps_BlendMaskUsingDetailUVs.material
@@ -5,7 +5,7 @@
     "propertyLayoutVersion": 3,
     "properties": {
         "baseColor": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_baseColor.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_BaseColor.png",
             "textureMapUv": "Unwrapped"
         },
         "detailLayerGroup": {
@@ -18,20 +18,24 @@
             "normalDetailStrength": 1.5
         },
         "detailUV": {
+            "center": [
+                0.0,
+                0.0
+            ],
             "scale": 10.0
         },
         "metallic": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_metallic.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Metallic.png",
             "textureMapUv": "Unwrapped"
         },
         "normal": {
             "flipY": true,
-            "textureMap": "Objects/Lucy/Lucy_normal.png",
+            "textureMap": "Objects/Lucy/Lucy_Normal.png",
             "textureMapUv": "Unwrapped"
         },
         "roughness": {
-            "textureMap": "Objects/Lucy/Lucy_bronze_roughness.png",
+            "textureMap": "Objects/Lucy/Lucy_bronze_Roughness.png",
             "textureMapUv": "Unwrapped"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Gems/Atom/TestData/TestData/Textures/Foliage_Leaves_0_BaseColor.dds.assetinfo b/Gems/Atom/TestData/TestData/Textures/Foliage_Leaves_0_BaseColor.dds.assetinfo
index 2ec31e38ce..1aa896a8d7 100644
--- a/Gems/Atom/TestData/TestData/Textures/Foliage_Leaves_0_BaseColor.dds.assetinfo
+++ b/Gems/Atom/TestData/TestData/Textures/Foliage_Leaves_0_BaseColor.dds.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_AmbientOcclusion.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_AmbientOcclusion.jpg
new file mode 100644
index 0000000000..04d871dd2b
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_AmbientOcclusion.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9ec269d03a9552c0ecf24778912fa6190c412b006433db8b7c40e1c0c83e6f7
+size 516915
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Color.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Color.jpg
new file mode 100644
index 0000000000..d41658d177
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Color.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b53c4aca020d5833618a5b73b6578c8693dd14e603eb32681e2c7ecc90f59047
+size 1020622
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Displacement.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Displacement.jpg
new file mode 100644
index 0000000000..913b35875c
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Displacement.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46ea8a9406ce6df21ce3a6045aac5b1421ce119919ff050951277dd76464ee2c
+size 258716
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Normal.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Normal.jpg
new file mode 100644
index 0000000000..7c216001a9
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Normal.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac1ad9bea240374bfc6aaaacc42e24eadfbf93c7185617fc1c52e610cb45cb69
+size 1292910
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Roughness.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Roughness.jpg
new file mode 100644
index 0000000000..5ac9e78409
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Ground033_1K_Roughness.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fce266a7445a4d4b5bb3fbf7cb3330e0580b058aeaf2ef7f265a01641dbbdc4
+size 637326
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_AmbientOcclusion.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_AmbientOcclusion.jpg
new file mode 100644
index 0000000000..772529329e
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_AmbientOcclusion.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca54f762bcddc10ab2d609f10864328cb5a567c43efb8c9bcfe9cb2955db9577
+size 433887
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Color.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Color.jpg
new file mode 100644
index 0000000000..8d1d23451d
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Color.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b5f5ff297aef6470045d087cf0c3341f7782e36a750965a052d49d03dd37426
+size 1595449
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Displacement.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Displacement.jpg
new file mode 100644
index 0000000000..22304c19dd
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Displacement.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8753448320e0916a70036ef77a06bce746bfa45c14e62b2fbda0987a13bfbb3
+size 277114
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Normal.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Normal.jpg
new file mode 100644
index 0000000000..129ecbb1b7
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Normal.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ea23ea8d85d1fffa119e481e6ac85ad3a3096470a5e12f252d37e1b293e5e37
+size 2119669
diff --git a/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Roughness.jpg b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Roughness.jpg
new file mode 100644
index 0000000000..dc5f8c20a9
--- /dev/null
+++ b/Gems/Atom/TestData/TestData/Textures/cc0/Rocks002_1K_Roughness.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:caa6e94f904135461da4d200fc6c21c86dc99cc7d413ea740e678f7758b2b156
+size 555680
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
index a41c8221f0..f2c120dbcd 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Include/AtomToolsFramework/Viewport/RenderViewportWidget.h
@@ -98,6 +98,7 @@ namespace AtomToolsFramework
         AZStd::optional<AZ::Vector3> ViewportScreenToWorld(const AzFramework::ScreenPoint& screenPosition, float depth) override;
         AZStd::optional<AzToolsFramework::ViewportInteraction::ProjectedViewportRay> ViewportScreenToWorldRay(
             const AzFramework::ScreenPoint& screenPosition) override;
+        float DeviceScalingFactor() override;
 
         //! Set interface for providing viewport specific settings (e.g. snapping properties).
         void SetViewportSettings(const AzToolsFramework::ViewportInteraction::ViewportSettings* viewportSettings);
diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
index cee178c724..35edb3af5b 100644
--- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
+++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Viewport/RenderViewportWidget.cpp
@@ -313,8 +313,7 @@ namespace AtomToolsFramework
         // Scale the size by the DPI of the platform to
         // get the proper size in pixels.
         const QSize uiWindowSize = size();
-        const qreal deficePixelRatio = devicePixelRatioF();
-        const QSize windowSize = uiWindowSize * deficePixelRatio;
+        const QSize windowSize = uiWindowSize * devicePixelRatioF();
 
         const AzFramework::NativeWindowHandle windowId = reinterpret_cast<AzFramework::NativeWindowHandle>(winId());
         AzFramework::WindowNotificationBus::Event(windowId, &AzFramework::WindowNotifications::OnWindowResized, windowSize.width(), windowSize.height());
@@ -465,6 +464,11 @@ namespace AtomToolsFramework
         return AzToolsFramework::ViewportInteraction::ProjectedViewportRay{rayOrigin, rayDirection};
     }
 
+    float RenderViewportWidget::DeviceScalingFactor()
+    {
+        return aznumeric_cast<float>(devicePixelRatioF());
+    }
+
     AzFramework::ScreenPoint RenderViewportWidget::ViewportCursorScreenPosition()
     {
         return AzToolsFramework::ViewportInteraction::ScreenPointFromQPoint(m_mousePosition.toPoint());
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Bricks038_8K/bricks038.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Bricks038_8K/bricks038.material
index 25e29b55e5..82b1cdb590 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Bricks038_8K/bricks038.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Bricks038_8K/bricks038.material
@@ -26,7 +26,6 @@
         },
         "parallax": {
             "algorithm": "POM",
-            "enable": true,
             "factor": 0.02500000037252903,
             "pdo": true,
             "quality": "Ultra",
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Concrete016_8K/Concrete016.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Concrete016_8K/Concrete016.material
index 336d479b30..03fb0ea5be 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Concrete016_8K/Concrete016.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Concrete016_8K/Concrete016.material
@@ -31,7 +31,8 @@
             "algorithm": "ContactRefinement",
             "factor": 0.019999999552965165,
             "quality": "Ultra",
-            "textureMap": "Materials/Concrete016_8K/Concrete016_8K_Displacement.png"
+            "textureMap": "Materials/Concrete016_8K/Concrete016_8K_Displacement.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Materials/Concrete016_8K/Concrete016_8K_Roughness.png"
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric001_8K/Fabric001.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric001_8K/Fabric001.material
index 72610e8bb6..7d8c3d5142 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric001_8K/Fabric001.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric001_8K/Fabric001.material
@@ -20,7 +20,6 @@
         },
         "parallax": {
             "algorithm": "ContactRefinement",
-            "enable": true,
             "factor": 0.004999999888241291,
             "quality": "Ultra",
             "textureMap": "Materials/Fabric001_8K/Fabric001_8K_Displacement.png"
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric030_4K/Fabric030.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric030_4K/Fabric030.material
index 458ab811b6..493bfab455 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric030_4K/Fabric030.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/Fabric030_4K/Fabric030.material
@@ -20,7 +20,6 @@
         },
         "parallax": {
             "algorithm": "ContactRefinement",
-            "enable": true,
             "factor": 0.0020000000949949028,
             "pdo": true,
             "quality": "Medium",
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/PaintedPlaster015_8K/PaintedPlaster015.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/PaintedPlaster015_8K/PaintedPlaster015.material
index 57163f520d..a2bb2c7704 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/PaintedPlaster015_8K/PaintedPlaster015.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/PaintedPlaster015_8K/PaintedPlaster015.material
@@ -19,7 +19,6 @@
         },
         "parallax": {
             "algorithm": "ContactRefinement",
-            "enable": true,
             "factor": 0.009999999776482582,
             "pdo": true,
             "quality": "Ultra",
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
index 625d872475..f75490c2ad 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/baseboards.material
@@ -30,7 +30,8 @@
             "factor": 0.02500000037252903,
             "pdo": true,
             "quality": "Ultra",
-            "textureMap": "Materials/Bricks038_8K/Bricks038_8K_Displacement.png"
+            "textureMap": "Materials/Bricks038_8K/Bricks038_8K_Displacement.png",
+            "useTexture": false
         },
         "roughness": {
             "factor": 0.4343433976173401,
diff --git a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/crown.material b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/crown.material
index e3c6d9eae6..d7e2050dbd 100644
--- a/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/crown.material
+++ b/Gems/AtomContent/LookDevelopmentStudioPixar/Assets/Materials/crown.material
@@ -22,7 +22,6 @@
         },
         "parallax": {
             "algorithm": "POM",
-            "enable": true,
             "factor": 0.02500000037252903,
             "pdo": true,
             "quality": "Ultra",
diff --git a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material
index ab9f366ff6..d4e2016022 100644
--- a/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material
+++ b/Gems/AtomContent/ReferenceMaterials/Assets/Materials/ConcreteStucco/concrete_stucco.material
@@ -19,7 +19,8 @@
         },
         "parallax": {
             "factor": 0.0010101000079885126,
-            "textureMap": "Materials/ConcreteStucco/concrete_stucco_height.jpg"
+            "textureMap": "Materials/ConcreteStucco/concrete_stucco_height.jpg",
+            "useTexture": false
         },
         "specularF0": {
             "factor": 0.5050504803657532
diff --git a/Gems/AtomContent/Sponza/Assets/license.txt b/Gems/AtomContent/Sponza/Assets/license.txt
new file mode 100644
index 0000000000..e303d8c767
--- /dev/null
+++ b/Gems/AtomContent/Sponza/Assets/license.txt
@@ -0,0 +1,8 @@
+The content in this gem "O3DE\Gems\AtomContent\Sponza" is ported 
+from the original source, and modified for the O3DE Engine and Atom Renderer.
+
+The original "Crytek Sponza" scene data can be downloaded from the
+"McGuire Computer Graphics Archive": https://casual-effects.com/data/
+
+The original content is under the "CC BY 3.0" License:
+https://creativecommons.org/licenses/by/3.0/
\ No newline at end of file
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
index 1102fb150a..d95e84121c 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_arch.material
@@ -41,7 +41,8 @@
             "factor": 0.050999999046325687,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/arch_1k_height.png"
+            "textureMap": "Textures/arch_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/arch_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
index c1853250d7..710f790419 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_background.material
@@ -47,7 +47,8 @@
             "factor": 0.03099999949336052,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/background_1k_height.png"
+            "textureMap": "Textures/background_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/background_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
index a269098b4d..26d64c7db9 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_bricks.material
@@ -46,7 +46,8 @@
             "algorithm": "ContactRefinement",
             "factor": 0.03500000014901161,
             "quality": "Medium",
-            "textureMap": "Textures/bricks_1k_height.png"
+            "textureMap": "Textures/bricks_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/bricks_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
index 94225cd00e..95d08d398b 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_ceiling.material
@@ -48,7 +48,8 @@
             "factor": 0.019999999552965165,
             "pdo": true,
             "quality": "Medium",
-            "textureMap": "Textures/ceiling_1k_height.png"
+            "textureMap": "Textures/ceiling_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/ceiling_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
index 8f1cea8649..cc1f685c7c 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columna.material
@@ -47,7 +47,8 @@
             "factor": 0.017000000923871995,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/columnA_1k_height.png"
+            "textureMap": "Textures/columnA_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/columnA_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
index ac474d7e76..a1e8747f65 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnb.material
@@ -46,7 +46,8 @@
             "factor": 0.020999999716877939,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/columnB_1k_height.png"
+            "textureMap": "Textures/columnB_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/columnB_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
index 81fd03fc4a..6edbfde47c 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_columnc.material
@@ -47,7 +47,8 @@
             "factor": 0.014000000432133675,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/columnC_1k_height.png"
+            "textureMap": "Textures/columnC_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/columnC_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
index fde599fd4c..1b66a51ec0 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_details.material
@@ -38,7 +38,8 @@
             "algorithm": "POM",
             "factor": 0.02500000037252903,
             "pdo": true,
-            "textureMap": "Textures/details_1k_height.png"
+            "textureMap": "Textures/details_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/details_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
index e50e8a0ed2..19010d66e5 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_flagpole.material
@@ -41,7 +41,8 @@
             "factor": 0.014000000432133675,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/flagpole_1k_height.png"
+            "textureMap": "Textures/flagpole_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/flagpole_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
index 064a2b24a6..bee92e0edb 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_floor.material
@@ -43,7 +43,8 @@
             "algorithm": "POM",
             "factor": 0.012000000104308129,
             "pdo": true,
-            "textureMap": "Textures/floor_1k_height.png"
+            "textureMap": "Textures/floor_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/floor_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
index 269e1e5684..ac326ae935 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_leaf.material
@@ -42,7 +42,8 @@
             "mode": "Cutout"
         },
         "parallax": {
-            "textureMap": "Textures/thorn_height.png"
+            "textureMap": "Textures/thorn_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/thorn_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
index 8dc4852b03..b1f78aa33f 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_lion.material
@@ -38,7 +38,6 @@
         },
         "parallax": {
             "algorithm": "ContactRefinement",
-            "enable": true,
             "factor": 0.009999999776482582,
             "pdo": true,
             "quality": "Ultra",
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material
index 0a7246703c..a3e066a438 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_roof.material
@@ -35,7 +35,8 @@
             "algorithm": "ContactRefinement",
             "factor": 0.019999999552965165,
             "quality": "Medium",
-            "textureMap": "Textures/roof_1k_height.png"
+            "textureMap": "Textures/roof_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/roof_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
index 77adc798a0..dea9aa2a8a 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vase.material
@@ -41,7 +41,8 @@
             "factor": 0.027000000700354577,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/vase_1k_height.png"
+            "textureMap": "Textures/vase_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/vase_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
index 22e78f03ae..b2a342dd76 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vasehanging.material
@@ -41,7 +41,8 @@
             "factor": 0.04600000008940697,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/vaseHanging_1k_height.png"
+            "textureMap": "Textures/vaseHanging_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/vaseHanging_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
index c773146b51..fba07379c0 100644
--- a/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
+++ b/Gems/AtomContent/Sponza/Assets/objects/sponza_mat_vaseround.material
@@ -45,7 +45,8 @@
             "factor": 0.019999999552965165,
             "pdo": true,
             "quality": "High",
-            "textureMap": "Textures/vaseRound_1k_height.png"
+            "textureMap": "Textures/vaseRound_1k_height.png",
+            "useTexture": false
         },
         "roughness": {
             "textureMap": "Textures/vaseRound_1k_roughness.png"
diff --git a/Gems/AtomContent/Sponza/Assets/stub b/Gems/AtomContent/Sponza/Assets/stub
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
index c431746b40..0723ca46b7 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
@@ -106,5 +106,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             Gem::AtomFont
             Gem::AtomToolsFramework.Editor
             Gem::AtomViewportDisplayInfo
+            Gem::AtomViewportDisplayIcons.Editor
     )
 endif()
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h
new file mode 100644
index 0000000000..f77e0b0b88
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Include/AtomBridge/PerViewportDynamicDrawInterface.h
@@ -0,0 +1,44 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzCore/Interface/Interface.h>
+#include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
+#include <AzFramework/Viewport/ViewportId.h>
+
+namespace AZ::AtomBridge
+{
+    //! A simple interface for allocating a DynamicDrawContext on-demand for every viewport, based on
+    //! a registered initialization function.
+    class PerViewportDynamicDrawInterface
+    {
+    public:
+        AZ_RTTI(PerViewportDynamicDrawInterface, "{1FF054F5-55FF-4ADB-A86D-640B15FA0395}");
+
+        using DrawContextFactory = AZStd::function<void(RHI::Ptr<RPI::DynamicDrawContext>)>;
+        //! Register a named dynamic draw context that can be retrieved on a per-viewport basis.
+        //! GetNamedDynamicDraw context can be called on a registered context name to retrieve a
+        //! valid DynamicDrawContext for a given viewport.
+        virtual void RegisterDynamicDrawContext(AZ::Name name, DrawContextFactory contextInitializer) = 0;
+
+        //! Unregister a previously registered named per-viewport dynamic draw context.
+        //! This will dispose of all dynamic draw contexts currently associated with this name.
+        virtual void UnregisterDynamicDrawContext(AZ::Name name) = 0;
+
+        //! Get a dynamic draw context associated with the specified viewport based on a factory registered with
+        //! RegisterNamedDynamicDrawContext. This dynamic draw context will be created if it does not already exist.
+        virtual RHI::Ptr<RPI::DynamicDrawContext> GetDynamicDrawContextForViewport(AZ::Name name, AzFramework::ViewportId viewportId) = 0;
+    };
+
+    using PerViewportDynamicDraw = AZ::Interface<PerViewportDynamicDrawInterface>;
+} // namespace AZ::AtomBridge
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
index 9148cdba6f..5116d8a228 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.cpp
@@ -13,6 +13,7 @@
 #include <AtomBridgeSystemComponent.h>
 #include <AtomDebugDisplayViewportInterface.h>
 #include <FlyCameraInputComponent.h>
+#include <PerViewportDynamicDrawManager.h>
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -104,10 +105,12 @@ namespace AZ
             AzFramework::GameEntityContextRequestBus::BroadcastResult(m_entityContextId, &AzFramework::GameEntityContextRequestBus::Events::GetGameEntityContextId);
 
             AZ::Render::Bootstrap::NotificationBus::Handler::BusConnect();
+            m_dynamicDrawManager = AZStd::make_unique<PerViewportDynamicDrawManager>();
         }
 
         void AtomBridgeSystemComponent::Deactivate()
         { 
+            m_dynamicDrawManager.reset();
             AZ::RPI::ViewportContextManagerNotificationsBus::Handler::BusDisconnect();
             RPI::Scene* scene = RPI::RPISystemInterface::Get()->GetDefaultScene().get();
             // Check if scene is emptry since scene might be released already when running AtomSampleViewer 
@@ -158,47 +161,8 @@ namespace AZ
 
         void AtomBridgeSystemComponent::OnBootstrapSceneReady(AZ::RPI::Scene* bootstrapScene)
         {
-            AZStd::shared_ptr<AZ::RPI::WindowContext> windowContext;
-            AZ::Render::Bootstrap::DefaultWindowBus::BroadcastResult(windowContext, &AZ::Render::Bootstrap::DefaultWindowInterface::GetDefaultWindowContext);
-
-            if (!windowContext)
-            {
-                AZ_Warning("Atom", false, "Cannot initialize Atom because no window context is available");
-                return;
-            }
-
-            AZ::RPI::RenderPipelinePtr renderPipeline = bootstrapScene->GetDefaultRenderPipeline();
-
-            // If RenderPipeline doesn't have a default view, create a view and make it the default view.
-            // These settings will be overridden by the editor or game camera.
-            if (renderPipeline->GetDefaultView() == nullptr)
-            {
-                auto viewContextManager = AZ::Interface<RPI::ViewportContextRequestsInterface>::Get();
-                m_view = AZ::RPI::View::CreateView(AZ::Name("AtomSystem Default View"), RPI::View::UsageCamera);
-                viewContextManager->PushView(viewContextManager->GetDefaultViewportContextName(), m_view);
-                const auto& viewport = windowContext->GetViewport();
-                const float aspectRatio = viewport.m_maxX / viewport.m_maxY;
-
-                // Note: This is projection assumes a setup for reversed depth
-                AZ::Matrix4x4 viewToClipMatrix;
-                AZ::MakePerspectiveFovMatrixRH(viewToClipMatrix, AZ::Constants::HalfPi, aspectRatio, 0.1f, 100.f, true);
-
-                m_view->SetViewToClipMatrix(viewToClipMatrix);
-
-                renderPipeline = bootstrapScene->GetDefaultRenderPipeline();
-                renderPipeline->SetDefaultView(m_view);
-            }
-            else
-            {
-                m_view = renderPipeline->GetDefaultView();
-            }
-            auto auxGeomFP = bootstrapScene->GetFeatureProcessor<RPI::AuxGeomFeatureProcessorInterface>();
-            if (auxGeomFP)
-            {
-                auxGeomFP->GetOrCreateDrawQueueForView(m_view.get());
-            }
-
-            // Make default AtomDebugDisplayViewportInterface for the scene
+            AZ_UNUSED(bootstrapScene);
+            // Make default AtomDebugDisplayViewportInterface
             AZStd::shared_ptr<AtomDebugDisplayViewportInterface> mainEntityDebugDisplay = AZStd::make_shared<AtomDebugDisplayViewportInterface>(AzFramework::g_defaultSceneEntityDebugDisplayId);
             m_activeViewportsList[AzFramework::g_defaultSceneEntityDebugDisplayId] = mainEntityDebugDisplay;
         }
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
index da75d3c35c..4d05ba9285 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/AtomBridgeSystemComponent.h
@@ -33,6 +33,7 @@ namespace AZ
     {
         // forward declares
         class AtomDebugDisplayViewportInterface;
+        class PerViewportDynamicDrawManager;
 
         class AtomBridgeSystemComponent
             : public Component
@@ -82,6 +83,7 @@ namespace AZ
             RPI::ViewPtr m_view = nullptr;
 
             AZStd::unordered_map<AzFramework::ViewportId, AZStd::shared_ptr<AtomDebugDisplayViewportInterface> > m_activeViewportsList;
+            AZStd::unique_ptr<PerViewportDynamicDrawManager> m_dynamicDrawManager;
         };
     }
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp
new file mode 100644
index 0000000000..b6ff116a86
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.cpp
@@ -0,0 +1,119 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include "PerViewportDynamicDrawManager.h"
+
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+
+namespace AZ::AtomBridge
+{
+    PerViewportDynamicDrawManager::PerViewportDynamicDrawManager()
+    {
+        PerViewportDynamicDraw::Register(this);
+    }
+
+    PerViewportDynamicDrawManager::~PerViewportDynamicDrawManager()
+    {
+        PerViewportDynamicDraw::Unregister(this);
+    }
+
+    void PerViewportDynamicDrawManager::RegisterDynamicDrawContext(AZ::Name name, DrawContextFactory contextInitializer)
+    {
+        AZStd::lock_guard lock(m_mutexDrawContexts);
+
+        const bool alreadyRegistered = m_registeredDrawContexts.find(name) != m_registeredDrawContexts.end();
+        AZ_Error("AtomBridge", !alreadyRegistered, "Attempted to call RegisterDynamicDrawContext for already registered name: \"%s\"", name.GetCStr());
+        if (alreadyRegistered)
+        {
+            return;
+        }
+        m_registeredDrawContexts[name] = contextInitializer;
+    }
+
+    void PerViewportDynamicDrawManager::UnregisterDynamicDrawContext(AZ::Name name)
+    {
+        AZStd::lock_guard lock(m_mutexDrawContexts);
+
+        auto drawContextFactoryIt = m_registeredDrawContexts.find(name);
+        const bool registered = drawContextFactoryIt != m_registeredDrawContexts.end();
+        AZ_Error("AtomBridge", registered, "Attempted to call UnregisterDynamicDrawContext for unregistered name: \"%s\"", name.GetCStr());
+        if (!registered)
+        {
+            return;
+        }
+        m_registeredDrawContexts.erase(drawContextFactoryIt);
+
+        for (auto& viewportData : m_viewportData)
+        {
+            viewportData.second.m_dynamicDrawContexts.erase(name);
+        }
+    }
+
+    RHI::Ptr<RPI::DynamicDrawContext> PerViewportDynamicDrawManager::GetDynamicDrawContextForViewport(
+        AZ::Name name, AzFramework::ViewportId viewportId)
+    {
+        AZStd::lock_guard lock(m_mutexDrawContexts);
+
+        auto contextFactoryIt = m_registeredDrawContexts.find(name);
+        if (contextFactoryIt == m_registeredDrawContexts.end())
+        {
+            return nullptr;
+        }
+
+        auto viewportContextManager = RPI::ViewportContextRequests::Get();
+        RPI::ViewportContextPtr viewportContext = viewportContextManager->GetViewportContextById(viewportId);
+        if (viewportContext == nullptr)
+        {
+            return nullptr;
+        }
+
+        // Get or create a ViewportData if one doesn't already exist
+        ViewportData& viewportData = m_viewportData[viewportId];
+        if (!viewportData.m_initialized)
+        {
+            viewportData.m_pipelineChangedHandler = AZ::Event<RPI::RenderPipelinePtr>::Handler([this, viewportId](RPI::RenderPipelinePtr pipeline)
+            {
+                AZStd::lock_guard lock(m_mutexDrawContexts);
+                ViewportData& viewportData = m_viewportData[viewportId];
+                for (auto& context : viewportData.m_dynamicDrawContexts)
+                {
+                    context.second->SetRenderPipeline(pipeline.get());
+                }
+            });
+            viewportData.m_viewportDestroyedHandler = AZ::Event<AzFramework::ViewportId>::Handler([this, viewportId](AzFramework::ViewportId id)
+            {
+                AZStd::lock_guard lock(m_mutexDrawContexts);
+                m_viewportData.erase(id);
+            });
+
+            viewportContext->ConnectCurrentPipelineChangedHandler(viewportData.m_pipelineChangedHandler);
+            viewportContext->ConnectAboutToBeDestroyedHandler(viewportData.m_viewportDestroyedHandler);
+
+            viewportData.m_initialized = true;
+        }
+
+        RHI::Ptr<RPI::DynamicDrawContext>& context = viewportData.m_dynamicDrawContexts[name];
+        if (context == nullptr)
+        {
+            auto pipeline = viewportContext->GetCurrentPipeline().get();
+            if (pipeline == nullptr)
+            {
+                return nullptr;
+            }
+            context = RPI::DynamicDrawInterface::Get()->CreateDynamicDrawContext(pipeline);
+            contextFactoryIt->second(context);
+        }
+
+        return context;
+    }
+} //namespace AZ::AtomBridge
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h
new file mode 100644
index 0000000000..e2b442915c
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/PerViewportDynamicDrawManager.h
@@ -0,0 +1,48 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AtomBridge/PerViewportDynamicDrawInterface.h>
+
+namespace AZ::AtomBridge
+{
+    class PerViewportDynamicDrawManager final : public PerViewportDynamicDrawInterface
+    {
+    public:
+        AZ_TYPE_INFO(PerViewportDynamicDrawManager, "{BED66185-00A7-43F7-BD28-C56BC8E4C535}");
+
+        PerViewportDynamicDrawManager();
+        ~PerViewportDynamicDrawManager();
+
+        // PerViewportDynamicDrawInterface overrides...
+        void RegisterDynamicDrawContext(AZ::Name name, DrawContextFactory contextInitializer) override;
+        void UnregisterDynamicDrawContext(AZ::Name name) override;
+        RHI::Ptr<RPI::DynamicDrawContext> GetDynamicDrawContextForViewport(AZ::Name name, AzFramework::ViewportId viewportId) override;
+
+    private:
+        struct ViewportData
+        {
+            AZStd::unordered_map<AZ::Name, RHI::Ptr<RPI::DynamicDrawContext>> m_dynamicDrawContexts;
+
+            // Event handlers
+            AZ::Event<RPI::RenderPipelinePtr>::Handler m_pipelineChangedHandler;
+            AZ::Event<AzFramework::ViewportId>::Handler m_viewportDestroyedHandler;
+
+            // Cached state
+            bool m_initialized = false;
+        };
+        AZStd::map<AzFramework::ViewportId, ViewportData> m_viewportData;
+        AZStd::unordered_map<AZ::Name, DrawContextFactory> m_registeredDrawContexts;
+        AZStd::mutex m_mutexDrawContexts;
+    };
+} //namespace AZ::AtomBridge
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
index f272d323ae..969030f922 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/atombridge_files.cmake
@@ -12,10 +12,13 @@
 set(FILES
     Include/AtomBridge/AtomBridgeBus.h
     Include/AtomBridge/FlyCameraInputBus.h
+    Include/AtomBridge/PerViewportDynamicDrawInterface.h
     Source/AtomBridgeSystemComponent.cpp
     Source/AtomBridgeSystemComponent.h
-    Source/FlyCameraInputComponent.cpp
-    Source/FlyCameraInputComponent.h
     Source/AtomDebugDisplayViewportInterface.cpp
     Source/AtomDebugDisplayViewportInterface.h
+    Source/FlyCameraInputComponent.cpp
+    Source/FlyCameraInputComponent.h
+    Source/PerViewportDynamicDrawManager.cpp
+    Source/PerViewportDynamicDrawManager.h
 )
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
index 3c76a9c788..623a931ac9 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp
@@ -896,7 +896,7 @@ AZ::RHI::Ptr<AZ::RPI::DynamicDrawContext> AZ::AtomFont::GetOrCreateDynamicDrawFo
     shaderOptions.push_back(AZ::RPI::ShaderOption(AZ::Name("o_useColorChannels"), AZ::Name("false")));
     shaderOptions.push_back(AZ::RPI::ShaderOption(AZ::Name("o_clamp"), AZ::Name("true")));
     dynamicDraw->InitShaderWithVariant(shader, &shaderOptions);
-    dynamicDraw->InitVertexFormat({{"POSITION", RHI::Format::R32G32B32_FLOAT}, {"COLOR", RHI::Format::R8G8B8A8_UNORM}, {"TEXCOORD0", RHI::Format::R32G32_FLOAT}});
+    dynamicDraw->InitVertexFormat({{"POSITION", RHI::Format::R32G32B32_FLOAT}, {"COLOR", RHI::Format::B8G8R8A8_UNORM}, {"TEXCOORD0", RHI::Format::R32G32_FLOAT}});
     dynamicDraw->EndInit();
 
     // exclusive lock while writing
diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
index f8afaa7260..31eb089803 100644
--- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
+++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp
@@ -54,7 +54,6 @@
 
 #include <Atom/RHI.Reflect/InputStreamLayoutBuilder.h>
 
-static const AZ::Vector2 UiDraw_TextSizeFactor = AZ::Vector2(12.0f, 12.0f);
 static const int TabCharCount = 4;
 // set buffer sizes to hold max characters that can be drawn in 1 DrawString call
 static const size_t MaxVerts = 8 * 1024; // 2048 quads
@@ -864,7 +863,7 @@ int AZ::FFont::CreateQuadsForText(const RHI::Viewport& viewport, float x, float
         if (drawFrame)
         {
             ColorB tempColor(255, 255, 255, 255);
-            uint32_t frameColor = tempColor.pack_abgr8888();        //note: this ends up in r,g,b,a order on little-endian machines
+            uint32_t frameColor = tempColor.pack_argb8888();        //note: this ends up in r,g,b,a order on little-endian machines
 
             Vec2 textSize = GetTextSizeUInternal(viewport, str, asciiMultiLine, ctx);
 
@@ -1122,7 +1121,7 @@ int AZ::FFont::CreateQuadsForText(const RHI::Viewport& viewport, float x, float
             {
                 ColorB tempColor = color;
                 tempColor.a = ((uint32_t) tempColor.a * alphaBlend) >> 8;
-                packedColor = tempColor.pack_abgr8888();                    //note: this ends up in r,g,b,a order on little-endian machines
+                packedColor = tempColor.pack_argb8888();                    //note: this ends up in r,g,b,a order on little-endian machines
             }
 
             if (ctx.m_drawTextFlags & eDrawText_UseTransform)
@@ -1673,6 +1672,12 @@ static void SetCommonContextFlags(AZ::TextDrawContext& ctx, const AzFramework::T
         {
             ctx.m_drawTextFlags |= eDrawText_FixedSize;
         }
+
+        if (params.m_useTransform)
+        {
+            ctx.m_drawTextFlags |= eDrawText_UseTransform;
+            ctx.SetTransform(AZMatrix3x4ToLYMatrix3x4(params.m_transform));
+        }
 }
 
 AZ::FFont::DrawParameters AZ::FFont::ExtractDrawParameters(const AzFramework::TextDrawParameters& params, AZStd::string_view text, bool forceCalculateSize)
@@ -1696,22 +1701,25 @@ AZ::FFont::DrawParameters AZ::FFont::ExtractDrawParameters(const AzFramework::Te
     }
     internalParams.m_ctx.SetBaseState(GS_NODEPTHTEST);
     internalParams.m_ctx.SetColor(AZColorToLYColorF(params.m_color));
+    internalParams.m_ctx.SetEffect(params.m_effectIndex);
     internalParams.m_ctx.SetCharWidthScale((params.m_monospace || params.m_scaleWithWindow) ? 0.5f : 1.0f);
     internalParams.m_ctx.EnableFrame(false);
     internalParams.m_ctx.SetProportional(!params.m_monospace && params.m_scaleWithWindow);
     internalParams.m_ctx.SetSizeIn800x600(params.m_scaleWithWindow && params.m_virtual800x600ScreenSize);
-    internalParams.m_ctx.SetSize(AZVec2ToLYVec2(UiDraw_TextSizeFactor * params.m_scale));
+    internalParams.m_ctx.SetSize(AZVec2ToLYVec2(AZ::Vector2(params.m_textSizeFactor, params.m_textSizeFactor) * params.m_scale));
     internalParams.m_ctx.SetLineSpacing(params.m_lineSpacing);
-    if (params.m_monospace || !params.m_scaleWithWindow)
-    {
-        ScaleCoord(viewport, posX, posY);
-    }
 
     if (params.m_hAlign != AzFramework::TextHorizontalAlignment::Left ||
         params.m_vAlign != AzFramework::TextVerticalAlignment::Top ||
         forceCalculateSize)
     {
+        // We align based on the size of the default font effect because we do not want the
+        // text to move when the font effect is changed
+        unsigned int effectIndex = internalParams.m_ctx.m_fxIdx;
+        internalParams.m_ctx.SetEffect(0);
         Vec2 textSize = GetTextSizeUInternal(viewport, text.data(), params.m_multiline, internalParams.m_ctx);
+        internalParams.m_ctx.SetEffect(effectIndex);
+        
         // If we're using virtual 800x600 coordinates, convert the text size from
         // pixels to that before using it as an offset.
         if (internalParams.m_ctx.m_sizeIn800x600)
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl
new file mode 100644
index 0000000000..c4367efe6b
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.azsl
@@ -0,0 +1,77 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+ 
+ #include <Atom/Features/SrgSemantics.azsli>
+
+ShaderResourceGroup InstanceSrg : SRG_PerDraw
+{
+    float2 m_viewportSize;
+    Texture2D m_texture;
+    
+    Sampler m_sampler
+    {
+        MaxAnisotropy = 16;
+        AddressU = Clamp;
+        AddressV = Clamp;
+        AddressW = Clamp;
+    };
+};
+
+struct VSInput
+{
+    float3 m_position : POSITION;
+    float4 m_color : COLOR0;
+    float2 m_uv : TEXCOORD0;
+};
+
+struct VSOutput
+{
+    float4 m_position : SV_Position;
+    float4 m_color : COLOR0;
+    float2 m_uv : TEXCOORD0;
+};
+
+VSOutput MainVS(VSInput IN)
+{
+    // Convert from screen space to clip space
+    float2 posXY = float2(IN.m_position.xy) / InstanceSrg::m_viewportSize * 2.0f - float2(1.0f, 1.0f);
+    posXY.y *= -1.0f;
+    float4 posPS = float4(posXY, IN.m_position.z, 1.0f);
+
+    VSOutput OUT;
+    OUT.m_position = posPS;
+    OUT.m_color = IN.m_color;
+    OUT.m_uv = IN.m_uv;
+    return OUT;
+};
+
+struct PSOutput
+{
+    float4 m_color : SV_Target0;
+};
+
+PSOutput MainPS(VSOutput IN)
+{
+    PSOutput OUT;
+
+    float4 tex;
+
+    tex = InstanceSrg::m_texture.Sample(InstanceSrg::m_sampler, IN.m_uv);
+    float opacity = IN.m_color.a * tex.a; 
+
+    // We use pre-multiplied alpha here since it is more flexible. For example, it enables alpha-blended rendering to
+    // a render target and then alpha blending that render target into another render target
+    OUT.m_color.rgb = IN.m_color.rgb * tex.rgb * opacity;
+
+    OUT.m_color.a = opacity;
+    return OUT;
+};
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.shader b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.shader
new file mode 100644
index 0000000000..601a2664b5
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Assets/Shaders/TexturedIcon.shader
@@ -0,0 +1,39 @@
+{
+    "Source" : "TexturedIcon",
+
+    "DepthStencilState" : { 
+        "Depth" : { 
+            "Enable" : false, 
+            "CompareFunc" : "Always"
+        }
+    },
+
+    "RasterState" : {
+        "DepthClipEnable" : false,
+        "CullMode" : "None"
+    },
+
+    "BlendState" : {
+        "Enable" : true, 
+        "BlendSource" : "One",
+        "BlendDest" : "AlphaSourceInverse", 
+        "BlendOp" : "Add"
+    },
+
+    "DrawList" : "2dpass",
+
+    "ProgramSettings":
+    {
+        "EntryPoints":
+        [
+            {
+                "name": "MainVS",
+                "type": "Vertex"
+            },
+            {
+                "name": "MainPS",
+                "type": "Fragment"
+            }
+        ]
+    }
+}
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt
new file mode 100644
index 0000000000..20a680bce9
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+add_subdirectory(Code)
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt
new file mode 100644
index 0000000000..b3e176c7a3
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/CMakeLists.txt
@@ -0,0 +1,35 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+if(PAL_TRAIT_BUILD_HOST_TOOLS)
+    ly_add_target(
+        NAME AtomViewportDisplayIcons.Editor ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
+        NAMESPACE Gem
+        FILES_CMAKE
+            atomviewportdisplayicons_files.cmake
+        INCLUDE_DIRECTORIES
+            PRIVATE
+                Source
+        BUILD_DEPENDENCIES
+            PRIVATE
+                AZ::AzCore
+                AZ::AzFramework
+                AZ::AzToolsFramework
+                AZ::AtomCore
+                3rdParty::Qt::Core
+                3rdParty::Qt::Gui
+                3rdParty::Qt::Svg
+                Gem::Atom_RHI.Reflect
+                Gem::Atom_RPI.Public
+                Gem::Atom_Bootstrap.Headers
+                Gem::Atom_AtomBridge.Static
+    )
+endif()
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
new file mode 100644
index 0000000000..5fe8c50350
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp
@@ -0,0 +1,357 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include "AtomViewportDisplayIconsSystemComponent.h"
+
+#include <AzCore/Serialization/SerializeContext.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/EditContextConstants.inl>
+#include <AzCore/std/containers/array.h>
+
+#include <AzFramework/Asset/AssetSystemBus.h>
+#include <AzFramework/Viewport/ViewportScreen.h>
+
+#include <AzToolsFramework/Viewport/ViewportMessages.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
+
+#include <Atom/RPI.Public/View.h>
+#include <Atom/RPI.Public/Scene.h>
+#include <Atom/RPI.Public/ViewportContextBus.h>
+#include <Atom/RPI.Public/ViewportContext.h>
+#include <Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h>
+#include <Atom/RPI.Public/RPIUtils.h>
+#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
+#include <Atom/RPI.Reflect/Image/StreamingImageAssetCreator.h>
+#include <Atom/RPI.Reflect/Image/ImageMipChainAssetCreator.h>
+#include <Atom/RPI.Public/Image/StreamingImagePool.h>
+
+#include <AtomBridge/PerViewportDynamicDrawInterface.h>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QImage>
+#include <QPainter>
+#include <QSvgRenderer>
+
+namespace AZ::Render
+{
+    void AtomViewportDisplayIconsSystemComponent::Reflect(AZ::ReflectContext* context)
+    {
+        if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
+        {
+            serialize->Class<AtomViewportDisplayIconsSystemComponent, AZ::Component>()
+                ->Version(0)
+                ;
+
+            if (AZ::EditContext* ec = serialize->GetEditContext())
+            {
+                ec->Class<AtomViewportDisplayIconsSystemComponent>("Viewport Display Icons", "Provides an interface for drawing simple icons to the Editor viewport")
+                    ->ClassElement(Edit::ClassElements::EditorData, "")
+                        ->Attribute(Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b))
+                        ->Attribute(Edit::Attributes::AutoExpand, true)
+                    ;
+            }
+        }
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    {
+        provided.push_back(AZ_CRC("ViewportDisplayIconsService"));
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
+    {
+        incompatible.push_back(AZ_CRC("ViewportDisplayIconsService"));
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.push_back(AZ_CRC("RPISystem", 0xf2add773));
+        required.push_back(AZ_CRC("AtomBridgeService", 0xdb816a99));
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)
+    {
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::Activate()
+    {
+        AzToolsFramework::EditorViewportIconDisplay::Register(this);
+
+        Bootstrap::NotificationBus::Handler::BusConnect();
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::Deactivate()
+    {
+        Bootstrap::NotificationBus::Handler::BusDisconnect();
+
+        auto perViewportDynamicDrawInterface = AtomBridge::PerViewportDynamicDraw::Get();
+        if (!perViewportDynamicDrawInterface)
+        {
+            return;
+        } 
+        if (perViewportDynamicDrawInterface)
+        {
+            perViewportDynamicDrawInterface->UnregisterDynamicDrawContext(m_drawContextName);
+        }
+
+        AzToolsFramework::EditorViewportIconDisplay::Unregister(this);
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::DrawIcon(const DrawParameters& drawParameters)
+    {
+        // Ensure we have a valid viewport context & dynamic draw interface
+        auto viewportContext = RPI::ViewportContextRequests::Get()->GetViewportContextById(drawParameters.m_viewport);
+        if (viewportContext == nullptr)
+        {
+            return;
+        }
+
+        auto perViewportDynamicDrawInterface =
+            AtomBridge::PerViewportDynamicDraw::Get();
+        if (!perViewportDynamicDrawInterface)
+        {
+            return;
+        } 
+
+        RHI::Ptr<RPI::DynamicDrawContext> dynamicDraw =
+            perViewportDynamicDrawInterface->GetDynamicDrawContextForViewport(m_drawContextName, drawParameters.m_viewport);
+        if (dynamicDraw == nullptr)
+        {
+            return;
+        }
+
+        // Find our icon, falling back on a grey placeholder if its image is unavailable
+        AZ::Data::Instance<AZ::RPI::Image> image = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::Grey);
+        if (auto iconIt = m_iconData.find(drawParameters.m_icon); iconIt != m_iconData.end())
+        {
+            auto& iconData = iconIt->second;
+            if (iconData.m_image)
+            {
+                image = iconData.m_image;
+            }
+        }
+        else
+        {
+            return;
+        }
+
+        // Initialize our shader
+        AZ::Vector2 viewportSize;
+        {
+            AzFramework::WindowSize viewportWindowSize = viewportContext->GetViewportSize();
+            viewportSize = AZ::Vector2{aznumeric_cast<float>(viewportWindowSize.m_width), aznumeric_cast<float>(viewportWindowSize.m_height)};
+        }
+        AZ::Data::Instance<AZ::RPI::ShaderResourceGroup> drawSrg = dynamicDraw->NewDrawSrg();
+        drawSrg->SetConstant(m_viewportSizeIndex,viewportSize);
+        drawSrg->SetImageView(m_textureParameterIndex, image->GetImageView());
+        drawSrg->Compile();
+
+        // Scale icons by screen DPI
+        float scalingFactor = 1.0f;
+        {
+            using ViewportRequestBus = AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus;
+            ViewportRequestBus::EventResult(
+                scalingFactor, drawParameters.m_viewport, &ViewportRequestBus::Events::DeviceScalingFactor);
+        }
+
+        AZ::Vector3 screenPosition;
+        if (drawParameters.m_positionSpace == CoordinateSpace::ScreenSpace)
+        {
+            screenPosition = drawParameters.m_position;
+        }
+        else if (drawParameters.m_positionSpace == CoordinateSpace::WorldSpace)
+        {
+            // Calculate our screen space position using the viewport size
+            // We want this instead of RenderViewportWidget::WorldToScreen which works in QWidget virtual coordinate space
+            AzFramework::ScreenPoint position = AzFramework::WorldToScreen(
+                drawParameters.m_position, viewportContext->GetCameraViewMatrix(), viewportContext->GetCameraProjectionMatrix(),
+                viewportSize);
+            screenPosition.SetX(aznumeric_cast<float>(position.m_x));
+            screenPosition.SetY(aznumeric_cast<float>(position.m_y));
+        }
+
+        struct Vertex
+        {
+            float m_position[3];
+            AZ::u32 m_color;
+            float m_uv[2];
+        };
+        using Indice = AZ::u16;
+
+        // Create a vertex offset from the position to draw from based on the icon size
+        // Vertex positions are in screen space coordinates
+        auto createVertex = [&](float offsetX, float offsetY, float u, float v) -> Vertex
+        {
+            Vertex vertex;
+            screenPosition.StoreToFloat3(vertex.m_position);
+            vertex.m_position[0] += offsetX * drawParameters.m_size.GetX() * scalingFactor;
+            vertex.m_position[1] += offsetY * drawParameters.m_size.GetY() * scalingFactor;
+            vertex.m_color = drawParameters.m_color.ToU32();
+            vertex.m_uv[0] = u;
+            vertex.m_uv[1] = v;
+            return vertex;
+        };
+
+        AZStd::array<Vertex, 4> vertices = {
+            createVertex(-0.5f, -0.5f, 0.f, 0.f),
+            createVertex(0.5f,  -0.5f, 1.f, 0.f),
+            createVertex(0.5f,  0.5f,  1.f, 1.f),
+            createVertex(-0.5f, 0.5f,  0.f, 1.f)
+        };
+        AZStd::array<Indice, 6> indices = {0, 1, 2, 0, 2, 3};
+        dynamicDraw->DrawIndexed(&vertices, vertices.size(), &indices, indices.size(), RHI::IndexFormat::Uint16, drawSrg);
+    }
+
+    QString AtomViewportDisplayIconsSystemComponent::FindAssetPath(const QString& path) const
+    {
+        // If we get an absolute path, just use it.
+        QFileInfo pathInfo(path);
+        if (pathInfo.isAbsolute())
+        {
+            return path;
+        }
+
+        bool found = false;
+        AZStd::vector<AZStd::string> scanFolders;
+        AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
+            found, &AzToolsFramework::AssetSystemRequestBus::Events::GetScanFolders, scanFolders);
+        if (!found)
+        {
+            AZ_Error("AtomViewportDisplayIconSystemComponent", false, "Failed to load asset scan folders");
+            return QString();
+        }
+
+        for (const auto& folder : scanFolders)
+        {
+            QDir dir(folder.data());
+            if (dir.exists(path))
+            {
+                return dir.absoluteFilePath(path);
+            }
+        }
+
+        return QString();
+    }
+
+    QImage AtomViewportDisplayIconsSystemComponent::RenderSvgToImage(const QString& svgPath) const
+    {
+        // Set up our SVG renderer
+        QSvgRenderer renderer(svgPath);
+        renderer.setAspectRatioMode(Qt::KeepAspectRatio);
+
+        // Set up our target image
+        QSize size = renderer.defaultSize().expandedTo(MinimumRenderedSvgSize);
+        QImage image(size, QtImageFormat);
+        image.fill(0x00000000);
+
+        // Render the SVG
+        QPainter painter(&image);
+        renderer.render(&painter);
+        return image;
+    }
+
+    AZ::Data::Instance<AZ::RPI::Image> AtomViewportDisplayIconsSystemComponent::ConvertToAtomImage(AZ::Uuid assetId, QImage image) const
+    {
+        // Ensure our image is in the correct pixel format so we can memcpy it to our renderer image
+        image.convertTo(QtImageFormat);
+        Data::Instance<RPI::StreamingImagePool> streamingImagePool = RPI::ImageSystemInterface::Get()->GetSystemStreamingPool();
+        return RPI::StreamingImage::CreateFromCpuData(
+            *streamingImagePool.get(),
+            RHI::ImageDimension::Image2D,
+            RHI::Size(image.width(), image.height(), 1),
+            RHI::Format::R8G8B8A8_UNORM_SRGB,
+            image.bits(),
+            image.sizeInBytes(),
+            assetId);
+    }
+
+    AzToolsFramework::EditorViewportIconDisplayInterface::IconId AtomViewportDisplayIconsSystemComponent::GetOrLoadIconForPath(
+        AZStd::string_view path)
+    {
+        // Check our cache to see if the image is already loaded
+        auto existingEntryIt = AZStd::find_if(m_iconData.begin(), m_iconData.end(), [&path](const auto& iconData)
+        {
+            return iconData.second.m_path == path;
+        });
+        if (existingEntryIt != m_iconData.end())
+        {
+            return existingEntryIt->first;
+        }
+
+        AZ::Uuid assetId = AZ::Uuid::CreateName(path.data());
+
+        // Find the asset to load on disk
+        QString assetPath = FindAssetPath(path.data());
+        if (assetPath.isEmpty())
+        {
+            AZ_Error("AtomViewportDisplayIconSystemComponent", false, "Failed to locate icon on disk: \"%s\"", path.data());
+            return InvalidIconId;
+        }
+
+        QImage loadedImage;
+
+        AZStd::string extension;
+        AzFramework::StringFunc::Path::GetExtension(path.data(), extension, false);
+        // For SVGs, we need to actually rasterize to an image
+        if (extension == "svg")
+        {
+            loadedImage = RenderSvgToImage(assetPath);
+        }
+        // For everything else, we can just load it through QImage via its image plugins
+        else
+        {
+            const bool loaded = loadedImage.load(assetPath);
+            if (!loaded)
+            {
+                AZ_Error("AtomViewportDisplayIconSystemComponent", false, "Failed to load icon: \"%s\"", assetPath.toUtf8().constData());
+                return InvalidIconId;
+            }
+        }
+
+        // Cache our loaded icon
+        IconId id = m_currentId++;
+        IconData& iconData = m_iconData[id];
+        iconData.m_path = path;
+        iconData.m_image = ConvertToAtomImage(assetId, loadedImage);
+        return id;
+    }
+
+    AzToolsFramework::EditorViewportIconDisplayInterface::IconLoadStatus AtomViewportDisplayIconsSystemComponent::GetIconLoadStatus(
+        IconId icon)
+    {
+        auto iconIt = m_iconData.find(icon);
+        if (iconIt == m_iconData.end())
+        {
+            return IconLoadStatus::Unloaded;
+        }
+        if (iconIt->second.m_image)
+        {
+            return IconLoadStatus::Loaded;
+        }
+        return IconLoadStatus::Error;
+    }
+
+    void AtomViewportDisplayIconsSystemComponent::OnBootstrapSceneReady([[maybe_unused]]AZ::RPI::Scene* bootstrapScene)
+    {
+        AtomBridge::PerViewportDynamicDraw::Get()->RegisterDynamicDrawContext(m_drawContextName, [](RPI::Ptr<RPI::DynamicDrawContext> drawContext)
+        {
+            auto shader = RPI::LoadShader(DrawContextShaderPath);
+            drawContext->InitShader(shader);
+            drawContext->InitVertexFormat(
+                {{"POSITION", RHI::Format::R32G32B32_FLOAT},
+                 {"COLOR", RHI::Format::R8G8B8A8_UNORM},
+                 {"TEXCOORD", RHI::Format::R32G32_FLOAT}});
+            drawContext->EndInit();
+        });
+    }
+} // namespace AZ::Render
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h
new file mode 100644
index 0000000000..b44957b51d
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.h
@@ -0,0 +1,82 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+#pragma once
+
+#include <AzCore/Component/Component.h>
+
+#include <AzToolsFramework/API/EditorViewportIconDisplayInterface.h>
+
+#include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
+#include <Atom/Bootstrap/BootstrapNotificationBus.h>
+
+#include <QImage>
+#include <QSize>
+#include <QString>
+
+namespace AZ
+{
+    class TickRequests;
+
+    namespace Render
+    {
+        class AtomViewportDisplayIconsSystemComponent
+            : public AZ::Component
+            , public AzToolsFramework::EditorViewportIconDisplayInterface
+            , public AZ::Render::Bootstrap::NotificationBus::Handler
+        {
+        public:
+            AZ_COMPONENT(AtomViewportDisplayIconsSystemComponent, "{AEC1D3E1-1D9A-437A-B4C6-CFAEE620C160}");
+
+            static void Reflect(AZ::ReflectContext* context);
+
+            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);
+
+        protected:
+            // AZ::Component overrides...
+            void Activate() override;
+            void Deactivate() override;
+
+            // AzToolsFramework::EditorViewportIconDisplayInterface overrides...
+            void DrawIcon(const DrawParameters& drawParameters) override;
+            IconId GetOrLoadIconForPath(AZStd::string_view path) override;
+            IconLoadStatus GetIconLoadStatus(IconId icon) override;
+
+            // AZ::Render::Bootstrap::NotificationBus::Handler overrides...
+            void OnBootstrapSceneReady(AZ::RPI::Scene* bootstrapScene) override;
+
+        private:
+            static constexpr const char* DrawContextShaderPath = "Shaders/TexturedIcon.azshader";
+            static constexpr QSize MinimumRenderedSvgSize = QSize(128, 128);
+            static constexpr QImage::Format QtImageFormat = QImage::Format_RGBA8888;
+
+            QString FindAssetPath(const QString& path) const;
+            QImage RenderSvgToImage(const QString& svgPath) const;
+            AZ::Data::Instance<AZ::RPI::Image> ConvertToAtomImage(AZ::Uuid assetId, QImage image) const;
+
+            Name m_drawContextName = Name("ViewportIconDisplay");
+            bool m_shaderIndexesInitialized = false;
+            RHI::ShaderInputNameIndex m_textureParameterIndex = "m_texture";
+            RHI::ShaderInputNameIndex m_viewportSizeIndex = "m_viewportSize";
+
+            struct IconData
+            {
+                AZStd::string m_path;
+                AZ::Data::Instance<AZ::RPI::Image> m_image = nullptr;
+            };
+            AZStd::unordered_map<IconId, IconData> m_iconData;
+            IconId m_currentId = 0;
+        };
+    } // namespace Render
+} // namespace AZ
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp
new file mode 100644
index 0000000000..db7672186a
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/Module.cpp
@@ -0,0 +1,51 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/RTTI/RTTI.h>
+#include <AzCore/Module/Module.h>
+
+#include "AtomViewportDisplayIconsSystemComponent.h"
+
+namespace AZ
+{
+    namespace Render
+    {
+        class AtomViewportDisplayInfoModule
+            : public AZ::Module
+        {
+        public:
+            AZ_RTTI(AtomViewportDisplayInfoModule, "{8D72F14E-958D-4225-B3BC-C5C87BDDD426}", AZ::Module);
+            AZ_CLASS_ALLOCATOR(AtomViewportDisplayInfoModule, AZ::SystemAllocator, 0);
+
+            AtomViewportDisplayInfoModule()
+                : AZ::Module()
+            {
+                m_descriptors.insert(m_descriptors.end(), {
+                        AtomViewportDisplayIconsSystemComponent::CreateDescriptor(),
+                    });
+            }
+
+            AZ::ComponentTypeList GetRequiredSystemComponents() const override
+            {
+                return AZ::ComponentTypeList{
+                    azrtti_typeid<AtomViewportDisplayIconsSystemComponent>(),
+                };
+            }
+        };
+    } // namespace Render
+} // namespace AZ
+
+// DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
+// The first parameter should be GemName_GemIdLower
+// The second should be the fully qualified name of the class above
+AZ_DECLARE_MODULE_CLASS(Gem_AtomViewportDisplayInfo, AZ::Render::AtomViewportDisplayInfoModule)
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake
new file mode 100644
index 0000000000..f02aed0856
--- /dev/null
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/atomviewportdisplayicons_files.cmake
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(FILES
+    Source/AtomViewportDisplayIconsSystemComponent.cpp
+    Source/AtomViewportDisplayIconsSystemComponent.h
+    Source/Module.cpp
+)
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
index 672c26a9ab..7d830b4ca9 100644
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
+++ b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp
@@ -18,10 +18,11 @@
 
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Interface/Interface.h>
+#include <Atom/RPI.Public/Pass/ParentPass.h>
+#include <Atom/RPI.Public/RenderPipeline.h>
 #include <Atom/RPI.Public/ViewportContextBus.h>
 #include <Atom/RPI.Public/ViewportContext.h>
 #include <Atom/RPI.Public/View.h>
-#include <Atom/RPI.Public/Pass/ParentPass.h>
 #include <Atom/RHI/Factory.h>
 
 #include <CryCommon/ISystem.h>
@@ -146,7 +147,7 @@ namespace AZ::Render
 
         if (m_updateRootPassQuery)
         {
-            if (auto rootPass = AZ::RPI::PassSystemInterface::Get()->GetRootPass())
+            if (auto rootPass = viewportContext->GetCurrentPipeline()->GetRootPass())
             {
                 rootPass->SetPipelineStatisticsQueryEnabled(displayLevel != AtomBridge::ViewportInfoDisplayState::CompactInfo);
                 m_updateRootPassQuery = false;
@@ -226,7 +227,8 @@ namespace AZ::Render
 
     void AtomViewportDisplayInfoSystemComponent::DrawPassInfo()
     {
-        auto rootPass = AZ::RPI::PassSystemInterface::Get()->GetRootPass();
+        AZ::RPI::ViewportContextPtr viewportContext = GetViewportContext();
+        auto rootPass = viewportContext->GetCurrentPipeline()->GetRootPass();
         const RPI::PipelineStatisticsResult stats = rootPass->GetLatestPipelineStatisticsResult();
         AZStd::function<int(const AZ::RPI::Ptr<AZ::RPI::Pass>)> containingPassCount = [&containingPassCount](const AZ::RPI::Ptr<AZ::RPI::Pass> pass)
         {
diff --git a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json b/Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
deleted file mode 100644
index dd92a99ea9..0000000000
--- a/Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "gem_name": "AtomLyIntegration_AtomViewportDisplayInfo",
-    "display_name": "Atom Viewport Display Info Overlay",
-    "summary": "Provides a diagnostic viewport overlay for the default O3DE Atom viewport.",
-    "canonical_tags": [
-        "Gem"
-    ],
-    "user_tags": [
-        "AtomLyIntegration",
-        "AtomViewportDisplayInfo"
-    ]
-}
\ No newline at end of file
diff --git a/Gems/AtomLyIntegration/CMakeLists.txt b/Gems/AtomLyIntegration/CMakeLists.txt
index 35022e643b..ff6800a7ff 100644
--- a/Gems/AtomLyIntegration/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/CMakeLists.txt
@@ -17,3 +17,4 @@ add_subdirectory(AtomFont)
 add_subdirectory(TechnicalArt)
 add_subdirectory(AtomBridge)
 add_subdirectory(AtomViewportDisplayInfo)
+add_subdirectory(AtomViewportDisplayIcons)
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
index 138d619d97..4d43d75406 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/AttachmentComponent.cpp
@@ -243,14 +243,14 @@ namespace AZ
             {
                 // apply offset in world-space
                 finalTransform = m_targetEntityTransform * m_targetBoneTransform;
-                finalTransform.SetScale(AZ::Vector3::CreateOne());
+                finalTransform.SetUniformScale(1.0f);
                 finalTransform *= m_targetOffset;
             }
             else if (m_scaleSource == AttachmentConfiguration::ScaleSource::TargetEntityScale)
             {
                 // apply offset in target-entity-space (ignoring bone scale)
                 AZ::Transform boneNoScale = m_targetBoneTransform;
-                boneNoScale.SetScale(AZ::Vector3::CreateOne());
+                boneNoScale.SetUniformScale(1.0f);
 
                 finalTransform = m_targetEntityTransform * boneNoScale * m_targetOffset;
             }
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
index 3b50c0a48c..f14340b4c9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
@@ -21,18 +21,42 @@ namespace AZ
 {
     namespace Render
     {
+        bool EditorAttachmentComponentVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
+        {
+            if (classElement.GetVersion() < 2)
+            {
+                float uniformScaleOffset = 1.0f;
+
+                int scaleElementIndex = classElement.FindElement(AZ_CRC_CE("Scale Offset"));
+                if (scaleElementIndex != -1)
+                {
+                    AZ::Vector3 oldScaleValue = AZ::Vector3::CreateOne();
+                    AZ::SerializeContext::DataElementNode& dataElementNode = classElement.GetSubElement(scaleElementIndex);
+                    if (dataElementNode.GetData<AZ::Vector3>(oldScaleValue))
+                    {
+                        uniformScaleOffset = oldScaleValue.GetMaxElement();
+                    }
+                    classElement.RemoveElement(scaleElementIndex);
+                }
+
+                classElement.AddElementWithData(context, "Uniform Scale Offset", uniformScaleOffset);
+            }
+
+            return true;
+        }
+
         void EditorAttachmentComponent::Reflect(AZ::ReflectContext* context)
         {
             AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
             if (serializeContext)
             {
                 serializeContext->Class<EditorAttachmentComponent, EditorComponentBase>()
-                    ->Version(1)
+                    ->Version(2, &EditorAttachmentComponentVersionConverter)
                     ->Field("Target ID", &EditorAttachmentComponent::m_targetId)
                     ->Field("Target Bone Name", &EditorAttachmentComponent::m_targetBoneName)
                     ->Field("Position Offset", &EditorAttachmentComponent::m_positionOffset)
                     ->Field("Rotation Offset", &EditorAttachmentComponent::m_rotationOffset)
-                    ->Field("Scale Offset", &EditorAttachmentComponent::m_scaleOffset)
+                    ->Field("Uniform Scale Offset", &EditorAttachmentComponent::m_uniformScaleOffset)
                     ->Field("Attached Initially", &EditorAttachmentComponent::m_attachedInitially)
                     ->Field("Scale Source", &EditorAttachmentComponent::m_scaleSource);
 
@@ -70,7 +94,7 @@ namespace AZ
                         ->Attribute(AZ::Edit::Attributes::Min, -AZ::RadToDeg(AZ::Constants::TwoPi))
                         ->Attribute(AZ::Edit::Attributes::Max, AZ::RadToDeg(AZ::Constants::TwoPi))
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
-                        ->DataElement(0, &EditorAttachmentComponent::m_scaleOffset, "Scale offset", "Local scale offset from target entity")
+                        ->DataElement(0, &EditorAttachmentComponent::m_uniformScaleOffset, "Scale offset", "Local scale offset from target entity")
                         ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
                         ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
                         ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
@@ -128,7 +152,7 @@ namespace AZ
         {
             AZ::Transform offset = AZ::ConvertEulerDegreesToTransform(m_rotationOffset);
             offset.SetTranslation(m_positionOffset);
-            offset.MultiplyByScale(m_scaleOffset);
+            offset.MultiplyByUniformScale(m_uniformScaleOffset);
             return offset;
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
index cac8a71a94..0f44043344 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
@@ -88,7 +88,7 @@ namespace AZ
             AZ::Vector3 m_rotationOffset = AZ::Vector3::CreateZero();
 
             //! Offset from target entity's scale.
-            AZ::Vector3 m_scaleOffset = AZ::Vector3::CreateOne();
+            float m_uniformScaleOffset = 1.0f;
 
             //! Observe scale information from the specified source.       
             AttachmentConfiguration::ScaleSource m_scaleSource = AttachmentConfiguration::ScaleSource::WorldScale;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
index 4ffb917f65..4291ce4d97 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/CapsuleLightDelegate.cpp
@@ -35,7 +35,7 @@ namespace AZ
             // This equation is based off of the integration of a line segment against a perpendicular normal pointing at the center of the
             // line segment from some distance away.
 
-            float scale = GetTransform().GetScale().GetMaxElement();
+            float scale = GetTransform().GetUniformScale();
             float h = GetInteriorHeight() * scale;
             float t2 = lightThreshold * lightThreshold;
             float h2 = h * h;
@@ -54,7 +54,7 @@ namespace AZ
                 const auto endpoints = m_shapeBus->GetCapsulePoints();
                 GetFeatureProcessor()->SetCapsuleLineSegment(GetLightHandle(), endpoints.m_begin, endpoints.m_end);
 
-                float scale = GetTransform().GetScale().GetMaxElement();
+                float scale = GetTransform().GetUniformScale();
                 float radius = m_shapeBus->GetRadius();
                 GetFeatureProcessor()->SetCapsuleRadius(GetLightHandle(), scale * radius);
             }
@@ -62,7 +62,7 @@ namespace AZ
 
         float CapsuleLightDelegate::GetSurfaceArea() const
         {
-            float scale = GetTransform().GetScale().GetMaxElement();
+            float scale = GetTransform().GetUniformScale();
             float radius = m_shapeBus->GetRadius();
             float capsArea = 4.0f * Constants::Pi * radius * radius; // both caps make a sphere
             float sideArea = 2.0f * Constants::Pi * radius * GetInteriorHeight(); // cylindrical area of capsule
@@ -77,7 +77,7 @@ namespace AZ
                 float radius = CalculateAttenuationRadius(AreaLightComponentConfig::CutoffIntensity);
 
                 // Add on the caps for the attenuation radius
-                float scale = GetTransform().GetScale().GetMaxElement();
+                float scale = GetTransform().GetUniformScale();
                 float height = m_shapeBus->GetHeight() * scale;
 
                 debugDisplay.SetColor(color);
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
index 7805a92cd1..8abc790ada 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/DiskLightDelegate.cpp
@@ -48,7 +48,7 @@ namespace AZ::Render
 
     float DiskLightDelegate::GetRadius() const
     {
-        return m_shapeBus->GetRadius() * GetTransform().GetScale().GetMaxElement();
+        return m_shapeBus->GetRadius() * GetTransform().GetUniformScale();
     }
 
     void DiskLightDelegate::DrawDebugDisplay(const Transform& transform, const Color& /*color*/, AzFramework::DebugDisplayRequests& debugDisplay, bool isSelected) const
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
index a40557f2f1..308a4ebd11 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/EditorDirectionalLightComponent.cpp
@@ -217,7 +217,7 @@ namespace AZ
                 GetEntityId(),
                 &TransformBus::Events::GetWorldTM);
 
-            transform.ExtractScale();
+            transform.ExtractUniformScale();
             const Vector3 origin = transform.GetTranslation();
             const Vector3 originOffset = origin - (transform.TransformVector(forward) * arrowOffset);
             const Vector3 target = origin - (transform.TransformVector(forward) * (arrowLength + arrowOffset));
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
index e01559041c..0cc01f4066 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/PolygonLightDelegate.cpp
@@ -73,7 +73,7 @@ namespace AZ
                 twiceArea += vertices.at(i).GetX() * vertices.at(j).GetY();
                 twiceArea -= vertices.at(i).GetY() * vertices.at(j).GetX();
             }
-            float scale = GetTransform().GetScale().GetMaxElement();
+            float scale = GetTransform().GetUniformScale();
             return GetAbs(twiceArea * 0.5f * scale * scale);
         }
 
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
index 2666be6f75..6caa8f31b3 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
@@ -76,12 +76,12 @@ namespace AZ
 
         float QuadLightDelegate::GetWidth() const
         {
-            return m_shapeBus->GetQuadWidth() * GetTransform().GetScale().GetX();
+            return m_shapeBus->GetQuadWidth() * GetTransform().GetUniformScale();
         }
 
         float QuadLightDelegate::GetHeight() const
         {
-            return m_shapeBus->GetQuadHeight() * GetTransform().GetScale().GetY();
+            return m_shapeBus->GetQuadHeight() * GetTransform().GetUniformScale();
         }
 
     } // namespace Render
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
index e3cf1fac78..afb63dce9b 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/SphereLightDelegate.cpp
@@ -50,7 +50,7 @@ namespace AZ
 
         float SphereLightDelegate::GetRadius() const
         {
-            return m_shapeBus->GetRadius() * GetTransform().GetScale().GetMaxElement();
+            return m_shapeBus->GetRadius() * GetTransform().GetUniformScale();
         }
 
         void SphereLightDelegate::DrawDebugDisplay(const Transform& transform, const Color& color, AzFramework::DebugDisplayRequests& debugDisplay, bool isSelected) const
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
index 0ddace1f87..5fb835de15 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.cpp
@@ -44,7 +44,17 @@ namespace AZ
                     ->Field("AmbientMultiplier", &DiffuseProbeGridComponentConfig::m_ambientMultiplier)
                     ->Field("ViewBias", &DiffuseProbeGridComponentConfig::m_viewBias)
                     ->Field("NormalBias", &DiffuseProbeGridComponentConfig::m_normalBias)
-                ;
+                    ->Field("EditorMode", &DiffuseProbeGridComponentConfig::m_editorMode)
+                    ->Field("RuntimeMode", &DiffuseProbeGridComponentConfig::m_runtimeMode)
+                    ->Field("BakedIrradianceTextureRelativePath", &DiffuseProbeGridComponentConfig::m_bakedIrradianceTextureRelativePath)
+                    ->Field("BakedDistanceTextureRelativePath", &DiffuseProbeGridComponentConfig::m_bakedDistanceTextureRelativePath)
+                    ->Field("BakedRelocationTextureRelativePath", &DiffuseProbeGridComponentConfig::m_bakedRelocationTextureRelativePath)
+                    ->Field("BakedClassificationTextureRelativePath", &DiffuseProbeGridComponentConfig::m_bakedClassificationTextureRelativePath)
+                    ->Field("BakedIrradianceTextureAsset", &DiffuseProbeGridComponentConfig::m_bakedIrradianceTextureAsset)
+                    ->Field("BakedDistanceTextureAsset", &DiffuseProbeGridComponentConfig::m_bakedDistanceTextureAsset)
+                    ->Field("BakedRelocationTextureAsset", &DiffuseProbeGridComponentConfig::m_bakedRelocationTextureAsset)
+                    ->Field("BakedClassificationTextureAsset", &DiffuseProbeGridComponentConfig::m_bakedClassificationTextureAsset)
+                    ;
             }
         }
 
@@ -110,6 +120,26 @@ namespace AZ
             m_boxShapeInterface = LmbrCentral::BoxShapeComponentRequestsBus::FindFirstHandler(m_entityId);
             AZ_Assert(m_boxShapeInterface, "DiffuseProbeGridComponentController was unable to find box shape component");
 
+            // special handling is required if this component is being cloned in the editor:
+            // check to see if the baked textures are already referenced by another DiffuseProbeGrid
+            if (m_featureProcessor->AreBakedTexturesReferenced(
+                    m_configuration.m_bakedIrradianceTextureRelativePath,
+                    m_configuration.m_bakedDistanceTextureRelativePath,
+                    m_configuration.m_bakedRelocationTextureRelativePath,
+                    m_configuration.m_bakedClassificationTextureRelativePath))
+            {
+                // clear the baked texture paths and assets, since they belong to the original entity (not the clone)
+                m_configuration.m_bakedIrradianceTextureRelativePath.clear();
+                m_configuration.m_bakedDistanceTextureRelativePath.clear();
+                m_configuration.m_bakedRelocationTextureRelativePath.clear();
+                m_configuration.m_bakedClassificationTextureRelativePath.clear();
+
+                m_configuration.m_bakedIrradianceTextureAsset.Reset();
+                m_configuration.m_bakedDistanceTextureAsset.Reset();
+                m_configuration.m_bakedRelocationTextureAsset.Reset();
+                m_configuration.m_bakedClassificationTextureAsset.Reset();
+            }
+
             // add this diffuse probe grid to the feature processor
             const AZ::Transform& transform = m_transformInterface->GetWorldTM();
             m_handle = m_featureProcessor->AddProbeGrid(transform, m_configuration.m_extents, m_configuration.m_probeSpacing);
@@ -118,11 +148,61 @@ namespace AZ
             m_featureProcessor->SetViewBias(m_handle, m_configuration.m_viewBias);
             m_featureProcessor->SetNormalBias(m_handle, m_configuration.m_normalBias);
 
+            // load the baked texture assets, but only if they are all valid
+            if (m_configuration.m_bakedIrradianceTextureAsset.GetId().IsValid() &&
+                m_configuration.m_bakedDistanceTextureAsset.GetId().IsValid() &&
+                m_configuration.m_bakedRelocationTextureAsset.GetId().IsValid() &&
+                m_configuration.m_bakedClassificationTextureAsset.GetId().IsValid())
+            {
+                Data::AssetBus::MultiHandler::BusConnect(m_configuration.m_bakedIrradianceTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusConnect(m_configuration.m_bakedDistanceTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusConnect(m_configuration.m_bakedRelocationTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusConnect(m_configuration.m_bakedClassificationTextureAsset.GetId());
+
+                m_configuration.m_bakedIrradianceTextureAsset.QueueLoad();
+                m_configuration.m_bakedDistanceTextureAsset.QueueLoad();
+                m_configuration.m_bakedRelocationTextureAsset.QueueLoad();
+                m_configuration.m_bakedClassificationTextureAsset.QueueLoad();
+            }
+            else if (m_configuration.m_runtimeMode == DiffuseProbeGridMode::Baked ||
+                     m_configuration.m_runtimeMode == DiffuseProbeGridMode::AutoSelect ||
+                     m_configuration.m_editorMode == DiffuseProbeGridMode::Baked ||
+                     m_configuration.m_editorMode == DiffuseProbeGridMode::AutoSelect)
+            {
+                AZ_Error("DiffuseProbeGrid", false, "DiffuseProbeGrid mdoe is set to Baked or Auto-Select, but it does not have baked texture assets. Please re-bake this DiffuseProbeGrid.");
+            }
+
+            m_featureProcessor->SetMode(m_handle, m_configuration.m_runtimeMode);
+
             // set box shape component dimensions from the configuration
             // this will invoke the OnShapeChanged() handler and set the outer extents on the feature processor
             m_boxShapeInterface->SetBoxDimensions(m_configuration.m_extents);
         }
 
+        void DiffuseProbeGridComponentController::OnAssetReady(Data::Asset<Data::AssetData> asset)
+        {
+            // if all assets are ready we can set the baked texture images
+            if (m_configuration.m_bakedIrradianceTextureAsset.IsReady() &&
+                m_configuration.m_bakedDistanceTextureAsset.IsReady() &&
+                m_configuration.m_bakedRelocationTextureAsset.IsReady() &&
+                m_configuration.m_bakedClassificationTextureAsset.IsReady())
+            {
+                Data::AssetBus::MultiHandler::BusDisconnect(m_configuration.m_bakedIrradianceTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusDisconnect(m_configuration.m_bakedDistanceTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusDisconnect(m_configuration.m_bakedRelocationTextureAsset.GetId());
+                Data::AssetBus::MultiHandler::BusDisconnect(m_configuration.m_bakedClassificationTextureAsset.GetId());
+
+                UpdateBakedTextures();
+            }
+        }
+
+        void DiffuseProbeGridComponentController::OnAssetError(Data::Asset<Data::AssetData> asset)
+        {
+            Data::AssetBus::MultiHandler::BusDisconnect(asset.GetId());
+
+            AZ_Error("DiffuseProbeGrid", false, "Failed to load baked texture [%s], please re-bake this DiffuseProbeGrid.", asset.GetId().ToString<AZStd::string>().c_str());
+        }
+
         void DiffuseProbeGridComponentController::Deactivate()
         {
             if (m_featureProcessor)
@@ -212,20 +292,96 @@ namespace AZ
 
         void DiffuseProbeGridComponentController::SetAmbientMultiplier(float ambientMultiplier)
         {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
             m_configuration.m_ambientMultiplier = ambientMultiplier;
             m_featureProcessor->SetAmbientMultiplier(m_handle, m_configuration.m_ambientMultiplier);
         }
 
         void DiffuseProbeGridComponentController::SetViewBias(float viewBias)
         {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
             m_configuration.m_viewBias = viewBias;
             m_featureProcessor->SetViewBias(m_handle, m_configuration.m_viewBias);
         }
 
         void DiffuseProbeGridComponentController::SetNormalBias(float normalBias)
         {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
             m_configuration.m_normalBias = normalBias;
             m_featureProcessor->SetNormalBias(m_handle, m_configuration.m_normalBias);
         }
+
+        void DiffuseProbeGridComponentController::SetEditorMode(DiffuseProbeGridMode editorMode)
+        {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
+            // update the configuration and change the DiffuseProbeGrid mode
+            m_configuration.m_editorMode = editorMode;
+            m_featureProcessor->SetMode(m_handle, m_configuration.m_editorMode);
+        }
+
+        void DiffuseProbeGridComponentController::SetRuntimeMode(DiffuseProbeGridMode runtimeMode)
+        {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
+            // only update the configuration
+            m_configuration.m_runtimeMode = runtimeMode;
+        }
+
+        void DiffuseProbeGridComponentController::BakeTextures(DiffuseProbeGridBakeTexturesCallback callback)
+        {
+            if (!m_featureProcessor)
+            {
+                return;
+            }
+
+            m_featureProcessor->BakeTextures(
+                m_handle,
+                callback,
+                m_configuration.m_bakedIrradianceTextureRelativePath,
+                m_configuration.m_bakedDistanceTextureRelativePath,
+                m_configuration.m_bakedRelocationTextureRelativePath,
+                m_configuration.m_bakedClassificationTextureRelativePath);
+        }
+
+        void DiffuseProbeGridComponentController::UpdateBakedTextures()
+        {
+           if (!m_featureProcessor)
+           {
+               return;
+           }
+           
+           DiffuseProbeGridBakedTextures bakedTextures;
+           bakedTextures.m_irradianceImage = RPI::StreamingImage::FindOrCreate(m_configuration.m_bakedIrradianceTextureAsset);
+           bakedTextures.m_irradianceImageRelativePath = m_configuration.m_bakedIrradianceTextureRelativePath;
+           bakedTextures.m_distanceImage = RPI::StreamingImage::FindOrCreate(m_configuration.m_bakedDistanceTextureAsset);
+           bakedTextures.m_distanceImageRelativePath = m_configuration.m_bakedDistanceTextureRelativePath;
+           bakedTextures.m_relocationImageDescriptor = m_configuration.m_bakedRelocationTextureAsset->GetImageDescriptor();
+           bakedTextures.m_relocationImageData = m_configuration.m_bakedRelocationTextureAsset->GetSubImageData(0, 0);
+           bakedTextures.m_relocationImageRelativePath = m_configuration.m_bakedRelocationTextureRelativePath;
+           bakedTextures.m_classificationImageDescriptor = m_configuration.m_bakedClassificationTextureAsset->GetImageDescriptor();
+           bakedTextures.m_classificationImageData = m_configuration.m_bakedClassificationTextureAsset->GetSubImageData(0, 0);
+           bakedTextures.m_classificationImageRelativePath = m_configuration.m_bakedClassificationTextureRelativePath;
+
+           m_featureProcessor->SetBakedTextures(m_handle, bakedTextures);
+        }
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.h
index 2bcb4132e9..4122a07ba2 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/DiffuseProbeGridComponentController.h
@@ -39,6 +39,19 @@ namespace AZ
             float m_ambientMultiplier = DefaultDiffuseProbeGridAmbientMultiplier;
             float m_viewBias = DefaultDiffuseProbeGridViewBias;
             float m_normalBias = DefaultDiffuseProbeGridNormalBias;
+
+            DiffuseProbeGridMode m_editorMode = DiffuseProbeGridMode::RealTime;
+            DiffuseProbeGridMode m_runtimeMode = DiffuseProbeGridMode::RealTime;
+
+            AZStd::string m_bakedIrradianceTextureRelativePath;
+            AZStd::string m_bakedDistanceTextureRelativePath;
+            AZStd::string m_bakedRelocationTextureRelativePath;
+            AZStd::string m_bakedClassificationTextureRelativePath;
+
+            Data::Asset<RPI::StreamingImageAsset> m_bakedIrradianceTextureAsset;
+            Data::Asset<RPI::StreamingImageAsset> m_bakedDistanceTextureAsset;
+            Data::Asset<RPI::StreamingImageAsset> m_bakedRelocationTextureAsset;
+            Data::Asset<RPI::StreamingImageAsset> m_bakedClassificationTextureAsset;
         };
 
         class DiffuseProbeGridComponentController final
@@ -79,12 +92,24 @@ namespace AZ
             // ShapeComponentNotificationsBus overrides
             void OnShapeChanged(ShapeChangeReasons changeReason) override;
 
+            // AssetBus overrides
+            void OnAssetReady(Data::Asset<Data::AssetData> asset) override;
+            void OnAssetError(Data::Asset<Data::AssetData> asset) override;
+
             // Property handlers
             bool ValidateProbeSpacing(const AZ::Vector3& newSpacing);
             void SetProbeSpacing(const AZ::Vector3& probeSpacing);
             void SetAmbientMultiplier(float ambientMultiplier);
             void SetViewBias(float viewBias);
             void SetNormalBias(float normalBias);
+            void SetEditorMode(DiffuseProbeGridMode editorMode);
+            void SetRuntimeMode(DiffuseProbeGridMode runtimeMode);
+
+            // Bake the diffuse probe grid textures to assets
+            void BakeTextures(DiffuseProbeGridBakeTexturesCallback callback);
+
+            // Update the baked texture assets from the configuration
+            void UpdateBakedTextures();
 
             // box shape component, used for defining the outer extents of the probe area
             LmbrCentral::BoxShapeComponentRequests* m_boxShapeInterface = nullptr;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
index ae22ec06c9..1e5b959803 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.cpp
@@ -16,6 +16,14 @@
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzCore/Component/Entity.h>
+#include <AzCore/IO/SystemFile.h>
+#include <Atom/RPI.Reflect/Image/StreamingImagePoolAsset.h>
+#include <Atom/Utils/DdsFile.h>
+
+AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
+#include <QApplication>
+#include <QMessageBox>
+AZ_POP_DISABLE_WARNING
 
 namespace AZ
 {
@@ -35,7 +43,9 @@ namespace AZ
                     ->Field("ambientMultiplier", &EditorDiffuseProbeGridComponent::m_ambientMultiplier)
                     ->Field("viewBias", &EditorDiffuseProbeGridComponent::m_viewBias)
                     ->Field("normalBias", &EditorDiffuseProbeGridComponent::m_normalBias)
-                ;
+                    ->Field("editorMode", &EditorDiffuseProbeGridComponent::m_editorMode)
+                    ->Field("runtimeMode", &EditorDiffuseProbeGridComponent::m_runtimeMode)
+                    ;
 
                 if (AZ::EditContext* editContext = serializeContext->GetEditContext())
                 {
@@ -48,25 +58,26 @@ namespace AZ
                             ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::PrimaryAssetType, AZ::AzTypeInfo<RPI::ModelAsset>::Uuid())
-                        ->ClassElement(AZ::Edit::ClassElements::Group, "Probe Spacing")
+                        ->ClassElement(AZ::Edit::ClassElements::Group, "Probe Spacing (meters between probes)")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingX, "X", "Probe spacing on the X-axis")
+                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingX, "X", "Probe spacing on the X-axis, in meters")
                                 ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                                 ->Attribute(AZ::Edit::Attributes::ChangeValidate, &EditorDiffuseProbeGridComponent::OnProbeSpacingValidateX)
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnProbeSpacingChanged)
-                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingY, "Y", "Probe spacing on the Y-axis")
+                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingY, "Y", "Probe spacing on the Y-axis, in meters")
                                 ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                                 ->Attribute(AZ::Edit::Attributes::ChangeValidate, &EditorDiffuseProbeGridComponent::OnProbeSpacingValidateY)
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnProbeSpacingChanged)
-                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingZ, "Z", "Probe spacing on the Z-axis")
+                            ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDiffuseProbeGridComponent::m_probeSpacingZ, "Z", "Probe spacing on the Z-axis, in meters")
                                 ->Attribute(AZ::Edit::Attributes::Min, 0.0f)
                                 ->Attribute(AZ::Edit::Attributes::ChangeValidate, &EditorDiffuseProbeGridComponent::OnProbeSpacingValidateZ)
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnProbeSpacingChanged)
                         ->ClassElement(AZ::Edit::ClassElements::Group, "Grid Settings")
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->DataElement(AZ::Edit::UIHandlers::Slider, &EditorDiffuseProbeGridComponent::m_ambientMultiplier, "Ambient Multiplier", "Multiplier for the irradiance intensity")
                                 ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnAmbientMultiplierChanged)
-                                ->Attribute(Edit::Attributes::Decimals, 0)
-                                ->Attribute(Edit::Attributes::Step, 1.0f)
+                                ->Attribute(Edit::Attributes::Decimals, 1)
+                                ->Attribute(Edit::Attributes::Step, 0.1f)
                                 ->Attribute(Edit::Attributes::Min, 0.0f)
                                 ->Attribute(Edit::Attributes::Max, 10.0f)
                             ->DataElement(AZ::Edit::UIHandlers::Slider, &EditorDiffuseProbeGridComponent::m_viewBias, "View Bias", "View bias adjustment")
@@ -81,6 +92,27 @@ namespace AZ
                                 ->Attribute(Edit::Attributes::Step, 0.1f)
                                 ->Attribute(Edit::Attributes::Min, 0.0f)
                                 ->Attribute(Edit::Attributes::Max, 1.0f)
+                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "Grid mode")
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                            ->DataElement(Edit::UIHandlers::ComboBox, &EditorDiffuseProbeGridComponent::m_editorMode, "Editor Mode", "Controls whether the editor uses RealTime or Baked diffuse GI. RealTime requires a ray-tracing capable GPU. Auto-Select will fallback to Baked if ray-tracing is not available")
+                                ->Attribute(AZ::Edit::Attributes::ChangeValidate, &EditorDiffuseProbeGridComponent::OnModeChangeValidate)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnEditorModeChanged)
+                                ->EnumAttribute(DiffuseProbeGridMode::RealTime, "Real Time (Ray-Traced)")
+                                ->EnumAttribute(DiffuseProbeGridMode::Baked, "Baked")
+                                ->EnumAttribute(DiffuseProbeGridMode::AutoSelect, "Auto Select")
+                            ->DataElement(Edit::UIHandlers::ComboBox, &EditorDiffuseProbeGridComponent::m_runtimeMode, "Runtime Mode", "Controls whether the runtime uses RealTime or Baked diffuse GI. RealTime requires a ray-tracing capable GPU. Auto-Select will fallback to Baked if ray-tracing is not available")
+                                ->Attribute(AZ::Edit::Attributes::ChangeValidate, &EditorDiffuseProbeGridComponent::OnModeChangeValidate)
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::OnRuntimeModeChanged)
+                                ->EnumAttribute(DiffuseProbeGridMode::RealTime, "Real Time (Ray-Traced)")
+                                ->EnumAttribute(DiffuseProbeGridMode::Baked, "Baked")
+                                ->EnumAttribute(DiffuseProbeGridMode::AutoSelect, "Auto Select")
+                        ->ClassElement(AZ::Edit::ClassElements::Group, "Bake Textures")
+                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                            ->UIElement(AZ::Edit::UIHandlers::Button, "Bake Textures", "Bake the Diffuse Probe Grid textures to static assets that will be used when the mode is set to Baked")
+                                ->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
+                                ->Attribute(AZ::Edit::Attributes::ButtonText, "Bake Textures")
+                                ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorDiffuseProbeGridComponent::BakeDiffuseProbeGrid)
+                                ->Attribute(AZ::Edit::Attributes::Visibility, &EditorDiffuseProbeGridComponent::GetBakeDiffuseProbeGridVisibilitySetting)
                         ;
 
                     editContext->Class<DiffuseProbeGridComponentController>(
@@ -90,12 +122,6 @@ namespace AZ
                         ->DataElement(AZ::Edit::UIHandlers::Default, &DiffuseProbeGridComponentController::m_configuration, "Configuration", "")
                             ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                         ;
-
-                    editContext->Class<DiffuseProbeGridComponentConfig>(
-                        "DiffuseProbeGridComponentConfig", "")
-                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                            ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
-                        ;
                 }
             }
 
@@ -121,15 +147,73 @@ namespace AZ
             BaseClass::Activate();
             AzFramework::EntityDebugDisplayEventBus::Handler::BusConnect(GetEntityId());
             AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusConnect(GetEntityId());
+            AZ::TickBus::Handler::BusConnect();
+            AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusConnect();
         }
 
         void EditorDiffuseProbeGridComponent::Deactivate()
         {
+            AzToolsFramework::EditorEntityInfoNotificationBus::Handler::BusDisconnect();
+            AZ::TickBus::Handler::BusDisconnect();
             AzToolsFramework::EditorComponentSelectionRequestsBus::Handler::BusDisconnect();
             AzFramework::EntityDebugDisplayEventBus::Handler::BusDisconnect();
             BaseClass::Deactivate();
         }
 
+        void EditorDiffuseProbeGridComponent::OnTick([[maybe_unused]] float deltaTime, [[maybe_unused]] AZ::ScriptTimePoint time)
+        {
+            if (!m_controller.m_featureProcessor)
+            {
+                return;
+            }
+
+            DiffuseProbeGridComponentConfig& configuration = m_controller.m_configuration;
+
+            // set the editor mode, which will override the runtime mode set by the controller
+            if (!m_editorModeSet)
+            {
+                m_controller.m_featureProcessor->SetMode(m_controller.m_handle, configuration.m_editorMode);
+                m_editorModeSet = true;
+            }
+
+            CheckTextureAssetNotification(configuration.m_bakedIrradianceTextureRelativePath, configuration.m_bakedIrradianceTextureAsset);
+            CheckTextureAssetNotification(configuration.m_bakedDistanceTextureRelativePath, configuration.m_bakedDistanceTextureAsset);
+            CheckTextureAssetNotification(configuration.m_bakedRelocationTextureRelativePath, configuration.m_bakedRelocationTextureAsset);
+            CheckTextureAssetNotification(configuration.m_bakedClassificationTextureRelativePath, configuration.m_bakedClassificationTextureAsset);
+        }
+
+        void EditorDiffuseProbeGridComponent::CheckTextureAssetNotification(const AZStd::string& relativePath, Data::Asset<RPI::StreamingImageAsset>& configurationAsset)
+        {
+            Data::Asset<RPI::StreamingImageAsset> textureAsset;
+            DiffuseProbeGridTextureNotificationType notificationType = DiffuseProbeGridTextureNotificationType::None;
+            if (m_controller.m_featureProcessor->CheckTextureAssetNotification(relativePath + ".streamingimage", textureAsset, notificationType))
+            {
+                if (notificationType == DiffuseProbeGridTextureNotificationType::Ready)
+                {
+                    // bake is complete, update configuration with the new baked texture asset
+                    AzToolsFramework::ScopedUndoBatch undoBatch("DiffuseProbeGrid Texture Bake");
+                    configurationAsset = { textureAsset.GetAs<RPI::StreamingImageAsset>(), AZ::Data::AssetLoadBehavior::PreLoad };
+                    SetDirty();
+
+                    if (m_controller.m_configuration.m_bakedIrradianceTextureAsset.IsReady() &&
+                        m_controller.m_configuration.m_bakedDistanceTextureAsset.IsReady() &&
+                        m_controller.m_configuration.m_bakedClassificationTextureAsset.IsReady() &&
+                        m_controller.m_configuration.m_bakedRelocationTextureAsset.IsReady())
+                    {
+                        m_controller.UpdateBakedTextures();
+                    }
+                }
+                else if (notificationType == DiffuseProbeGridTextureNotificationType::Error)
+                {
+                    QMessageBox::information(
+                        QApplication::activeWindow(),
+                        "Diffuse Probe Grid",
+                        "Diffuse Probe Grid texture failed to bake, please check the Asset Processor for more information.",
+                        QMessageBox::Ok);
+                }
+            }
+        }
+
         AZ::Aabb EditorDiffuseProbeGridComponent::GetEditorSelectionBoundsViewport([[maybe_unused]] const AzFramework::ViewportInfo& viewportInfo)
         {
             return m_controller.GetAabb();
@@ -140,11 +224,19 @@ namespace AZ
             return false;
         }
 
+        void EditorDiffuseProbeGridComponent::OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool visible)
+        {
+            if ((GetEntityId() == entityId) && !visible)
+            {
+                m_editorModeSet = false;
+            }
+        }
+
         AZ::Outcome<void, AZStd::string> EditorDiffuseProbeGridComponent::OnProbeSpacingValidateX(void* newValue, [[maybe_unused]] const AZ::Uuid& valueType)
         {
             if (!m_controller.m_featureProcessor)
             {
-                return AZ::Failure(AZStd::string("Unable to adjust probe spacing, please try again"));
+                return AZ::Failure(AZStd::string("This Diffuse Probe Grid entity is hidden, it must be visible in order to change the probe spacing."));
             }
 
             float newProbeSpacingX = *(reinterpret_cast<float*>(newValue));
@@ -152,7 +244,7 @@ namespace AZ
             Vector3 newSpacing(newProbeSpacingX, m_probeSpacingY, m_probeSpacingZ);
             if (!m_controller.ValidateProbeSpacing(newSpacing))
             {
-                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents"));
+                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents."));
             }
 
             return AZ::Success();
@@ -162,7 +254,7 @@ namespace AZ
         {
             if (!m_controller.m_featureProcessor)
             {
-                return AZ::Failure(AZStd::string("Unable to adjust probe spacing, please try again"));
+                return AZ::Failure(AZStd::string("This Diffuse Probe Grid entity is hidden, it must be visible in order to change the probe spacing."));
             }
 
             float newProbeSpacingY = *(reinterpret_cast<float*>(newValue));
@@ -170,7 +262,7 @@ namespace AZ
             Vector3 newSpacing(m_probeSpacingX, newProbeSpacingY, m_probeSpacingZ);
             if (!m_controller.ValidateProbeSpacing(newSpacing))
             {
-                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents"));
+                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents."));
             }
 
             return AZ::Success();
@@ -180,7 +272,7 @@ namespace AZ
         {
             if (!m_controller.m_featureProcessor)
             {
-                return AZ::Failure(AZStd::string("Unable to adjust probe spacing, please try again"));
+                return AZ::Failure(AZStd::string("This Diffuse Probe Grid entity is hidden, it must be visible in order to change the probe spacing."));
             }
 
             float newProbeSpacingZ = *(reinterpret_cast<float*>(newValue));
@@ -188,7 +280,7 @@ namespace AZ
             Vector3 newSpacing(m_probeSpacingX, m_probeSpacingY, newProbeSpacingZ);
             if (!m_controller.ValidateProbeSpacing(newSpacing))
             {
-                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents"));
+                return AZ::Failure(AZStd::string("Probe spacing exceeds max allowable grid size with current extents."));
             }
 
             return AZ::Success();
@@ -218,5 +310,226 @@ namespace AZ
             m_controller.SetNormalBias(m_normalBias);
             return AZ::Edit::PropertyRefreshLevels::None;
         }
+
+        AZ::u32 EditorDiffuseProbeGridComponent::OnEditorModeChanged()
+        {
+            // this will update the configuration and also change the DiffuseProbeGrid mode
+            m_controller.SetEditorMode(m_editorMode);
+            return AZ::Edit::PropertyRefreshLevels::EntireTree;
+        }
+
+        AZ::u32 EditorDiffuseProbeGridComponent::OnRuntimeModeChanged()
+        {
+            // this will only update the configuration
+            m_controller.SetRuntimeMode(m_runtimeMode);
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        AZ::Outcome<void, AZStd::string> EditorDiffuseProbeGridComponent::OnModeChangeValidate([[maybe_unused]] void* newValue, [[maybe_unused]] const AZ::Uuid& valueType)
+        {
+            DiffuseProbeGridMode newMode = (*(reinterpret_cast<DiffuseProbeGridMode*>(newValue)));
+
+            if (newMode == DiffuseProbeGridMode::Baked || newMode == DiffuseProbeGridMode::AutoSelect)
+            {
+                if (!m_controller.m_configuration.m_bakedIrradianceTextureAsset.GetId().IsValid() ||
+                    !m_controller.m_configuration.m_bakedDistanceTextureAsset.GetId().IsValid() ||
+                    !m_controller.m_configuration.m_bakedRelocationTextureAsset.GetId().IsValid() ||
+                    !m_controller.m_configuration.m_bakedClassificationTextureAsset.GetId().IsValid())
+                {
+                    return AZ::Failure(AZStd::string("Please bake textures before changing the Diffuse Probe Grid to Baked or Auto-Select mode."));
+                }
+            }
+
+            return AZ::Success();
+        }
+
+        AZ::u32 EditorDiffuseProbeGridComponent::GetBakeDiffuseProbeGridVisibilitySetting()
+        {
+            // the Bake button is visible only when the editor mode is set to RealTime
+            return m_editorMode == DiffuseProbeGridMode::RealTime ? AZ::Edit::PropertyVisibility::Show : AZ::Edit::PropertyVisibility::Hide;
+        }
+
+        AZ::u32 EditorDiffuseProbeGridComponent::BakeDiffuseProbeGrid()
+        {
+            if (m_bakeInProgress)
+            {
+                return AZ::Edit::PropertyRefreshLevels::None;
+            }
+
+            // retrieve entity visibility
+            bool isHidden = false;
+            AzToolsFramework::EditorEntityInfoRequestBus::EventResult(
+                isHidden,
+                GetEntityId(),
+                &AzToolsFramework::EditorEntityInfoRequestBus::Events::IsHidden);
+
+            // the entity must be visible in order to bake
+            if (isHidden)
+            {
+                QMessageBox::information(
+                    QApplication::activeWindow(),
+                    "Diffuse Probe Grid",
+                    "This Diffuse Probe Grid entity is hidden, it must be visible in order to bake textures.",
+                    QMessageBox::Ok);
+
+                return AZ::Edit::PropertyRefreshLevels::None;
+            }
+
+            DiffuseProbeGridComponentConfig& configuration = m_controller.m_configuration;
+
+            // retrieve the source image paths from the configuration
+            // Note: we need to make sure to use the same source image for each bake
+            AZStd::string irradianceTextureRelativePath = ValidateOrCreateNewTexturePath(configuration.m_bakedIrradianceTextureRelativePath, DiffuseProbeGridIrradianceFileName);
+            AZStd::string distanceTextureRelativePath = ValidateOrCreateNewTexturePath(configuration.m_bakedDistanceTextureRelativePath, DiffuseProbeGridDistanceFileName);
+            AZStd::string relocationTextureRelativePath = ValidateOrCreateNewTexturePath(configuration.m_bakedRelocationTextureRelativePath, DiffuseProbeGridRelocationFileName);
+            AZStd::string classificationTextureRelativePath = ValidateOrCreateNewTexturePath(configuration.m_bakedClassificationTextureRelativePath, DiffuseProbeGridClassificationFileName);
+
+            // create the full paths
+            char projectPath[AZ_MAX_PATH_LEN];
+            AZ::IO::FileIOBase::GetInstance()->ResolvePath("@devassets@", projectPath, AZ_MAX_PATH_LEN);
+
+            AZStd::string irradianceTextureFullPath;
+            AzFramework::StringFunc::Path::Join(projectPath, irradianceTextureRelativePath.c_str(), irradianceTextureFullPath, true, true);
+            AZStd::string distanceTextureFullPath;
+            AzFramework::StringFunc::Path::Join(projectPath, distanceTextureRelativePath.c_str(), distanceTextureFullPath, true, true);
+            AZStd::string relocationTextureFullPath;
+            AzFramework::StringFunc::Path::Join(projectPath, relocationTextureRelativePath.c_str(), relocationTextureFullPath, true, true);
+            AZStd::string classificationTextureFullPath;
+            AzFramework::StringFunc::Path::Join(projectPath, classificationTextureRelativePath.c_str(), classificationTextureFullPath, true, true);
+
+            // make sure the folder is created
+            AZStd::string diffuseProbeGridFolder;
+            AzFramework::StringFunc::Path::GetFolderPath(irradianceTextureFullPath.data(), diffuseProbeGridFolder);
+            AZ::IO::SystemFile::CreateDir(diffuseProbeGridFolder.c_str());
+
+            // check out the files in source control
+            CheckoutSourceTextureFile(irradianceTextureFullPath);
+            CheckoutSourceTextureFile(distanceTextureFullPath);
+            CheckoutSourceTextureFile(relocationTextureFullPath);
+            CheckoutSourceTextureFile(classificationTextureFullPath);
+
+            // update the configuration
+            AzToolsFramework::ScopedUndoBatch undoBatch("DiffuseProbeGrid bake");
+            configuration.m_bakedIrradianceTextureRelativePath = irradianceTextureRelativePath;
+            configuration.m_bakedDistanceTextureRelativePath = distanceTextureRelativePath;
+            configuration.m_bakedRelocationTextureRelativePath = relocationTextureRelativePath;
+            configuration.m_bakedClassificationTextureRelativePath = classificationTextureRelativePath;
+            SetDirty();
+
+            // callback for the texture readback
+            DiffuseProbeGridBakeTexturesCallback bakeTexturesCallback = [=](
+                DiffuseProbeGridTexture irradianceTexture,
+                DiffuseProbeGridTexture distanceTexture,
+                DiffuseProbeGridTexture relocationTexture,
+                DiffuseProbeGridTexture classificationTexture)
+            {
+                // irradiance
+                {
+                    AZ::DdsFile::DdsFileData fileData = { irradianceTexture.m_size, irradianceTexture.m_format, irradianceTexture.m_data.get() };
+                    [[maybe_unused]] const auto outcome = AZ::DdsFile::WriteFile(irradianceTextureFullPath, fileData);
+                    AZ_Assert(outcome.IsSuccess(), "Failed to write Irradiance texture .dds file [%s]", irradianceTextureFullPath.c_str());
+                }
+
+                // distance
+                {
+                    AZ::DdsFile::DdsFileData fileData = { distanceTexture.m_size, distanceTexture.m_format, distanceTexture.m_data.get() };
+                    [[maybe_unused]] const auto outcome = AZ::DdsFile::WriteFile(distanceTextureFullPath, fileData);
+                    AZ_Assert(outcome.IsSuccess(), "Failed to write Distance texture .dds file [%s]", distanceTextureFullPath.c_str());
+                }
+
+                // relocation
+                {
+                    AZ::DdsFile::DdsFileData fileData = { relocationTexture.m_size, relocationTexture.m_format, relocationTexture.m_data.get() };
+                    [[maybe_unused]] const auto outcome = AZ::DdsFile::WriteFile(relocationTextureFullPath, fileData);
+                    AZ_Assert(outcome.IsSuccess(), "Failed to write Relocation texture .dds file [%s]", relocationTextureFullPath.c_str());
+                }
+
+                // classification
+                {
+                    AZ::DdsFile::DdsFileData fileData = { classificationTexture.m_size, classificationTexture.m_format, classificationTexture.m_data.get() };
+                    [[maybe_unused]] const auto outcome = AZ::DdsFile::WriteFile(classificationTextureFullPath, fileData);
+                    AZ_Assert(outcome.IsSuccess(), "Failed to write Classification texture .dds file [%s]", classificationTextureFullPath.c_str());
+                }
+
+                m_bakeInProgress = false;
+            };
+
+            m_bakeInProgress = true;
+            m_controller.BakeTextures(bakeTexturesCallback);
+
+            while (m_bakeInProgress)
+            {
+                QApplication::processEvents();
+                AZStd::this_thread::sleep_for(AZStd::chrono::milliseconds(100));
+            }
+
+            QMessageBox::information(
+                QApplication::activeWindow(),
+                "Diffuse Probe Grid",
+                "Successfully baked Diffuse Probe Grid textures.",
+                QMessageBox::Ok);
+
+            return AZ::Edit::PropertyRefreshLevels::None;
+        }
+
+        AZStd::string EditorDiffuseProbeGridComponent::ValidateOrCreateNewTexturePath(const AZStd::string& configurationRelativePath, const char* fileSuffix)
+        {
+            AZStd::string relativePath = configurationRelativePath;
+            AZStd::string fullPath;
+
+            char projectPath[AZ_MAX_PATH_LEN];
+            AZ::IO::FileIOBase::GetInstance()->ResolvePath("@devassets@", projectPath, AZ_MAX_PATH_LEN);
+
+            if (!relativePath.empty())
+            {
+                // test to see if the texture file is actually there, if it was removed we need to
+                // generate a new filename, otherwise it will cause an error in the asset system
+                AzFramework::StringFunc::Path::Join(projectPath, configurationRelativePath.c_str(), fullPath, true, true);
+
+                if (!AZ::IO::FileIOBase::GetInstance()->Exists(fullPath.c_str()))
+                {
+                    // file does not exist, clear the relative path so we generate a new name
+                    relativePath.clear();
+                }
+            }
+                         
+            // build a new image path if necessary
+            if (relativePath.empty())
+            {
+                // the file name is a combination of the entity name, a UUID, and the filemask
+                Entity* entity = GetEntity();
+                AZ_Assert(entity, "DiffuseProbeGrid entity is null");
+
+                AZ::Uuid uuid = AZ::Uuid::CreateRandom();
+                AZStd::string uuidString;
+                uuid.ToString(uuidString);
+
+                relativePath = "DiffuseProbeGrids/" + entity->GetName() + uuidString + fileSuffix;
+
+                // replace any invalid filename characters
+                auto invalidCharacters = [](char letter)
+                {
+                    return
+                        letter == ':' || letter == '"' || letter == '\'' ||
+                        letter == '{' || letter == '}' ||
+                        letter == '<' || letter == '>';
+                };
+                AZStd::replace_if(relativePath.begin(), relativePath.end(), invalidCharacters, '_');
+            }
+
+            return relativePath;
+        }
+
+        void EditorDiffuseProbeGridComponent::CheckoutSourceTextureFile(const AZStd::string& fullPath)
+        {
+            bool checkedOutSuccessfully = false;
+            using ApplicationBus = AzToolsFramework::ToolsApplicationRequestBus;
+            ApplicationBus::BroadcastResult(
+                checkedOutSuccessfully,
+                &ApplicationBus::Events::RequestEditForFileBlocking,
+                fullPath.c_str(),
+                "Checking out for edit...",
+                ApplicationBus::Events::RequestEditProgressCallback());
+        }
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.h
index 2a50c47b81..15c46d45ba 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseProbeGrid/EditorDiffuseProbeGridComponent.h
@@ -12,8 +12,10 @@
 
 #pragma once
 
+#include <AzCore/Component/TickBus.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
 #include <DiffuseProbeGrid/DiffuseProbeGridComponent.h>
 #include <DiffuseProbeGrid/DiffuseProbeGridComponentConstants.h>
 #include <Atom/Feature/Utils/EditorRenderComponentAdapter.h>
@@ -26,6 +28,8 @@ namespace AZ
             : public EditorRenderComponentAdapter<DiffuseProbeGridComponentController, DiffuseProbeGridComponent, DiffuseProbeGridComponentConfig>
             , private AzToolsFramework::EditorComponentSelectionRequestsBus::Handler
             , private AzFramework::EntityDebugDisplayEventBus::Handler
+            , private AZ::TickBus::Handler
+            , private AzToolsFramework::EditorEntityInfoNotificationBus::Handler
         {
         public:
             using BaseClass = EditorRenderComponentAdapter<DiffuseProbeGridComponentController, DiffuseProbeGridComponent, DiffuseProbeGridComponentConfig>;
@@ -41,10 +45,22 @@ namespace AZ
             void Deactivate() override;
 
         private:
+
+            // AZ::TickBus overrides
+            void OnTick(float deltaTime, AZ::ScriptTimePoint time) override;
+
             // EditorComponentSelectionRequestsBus overrides
             AZ::Aabb GetEditorSelectionBoundsViewport(const AzFramework::ViewportInfo& viewportInfo) override;
             bool SupportsEditorRayIntersect() override;
 
+            // EditorEntityInfoNotifications overrides
+            void OnEntityInfoUpdatedVisibility(AZ::EntityId entityId, bool visible) override;
+
+            // helper functions
+            AZStd::string ValidateOrCreateNewTexturePath(const AZStd::string& relativePath, const char* fileSuffix);
+            void CheckoutSourceTextureFile(const AZStd::string& fullPath);
+            void CheckTextureAssetNotification(const AZStd::string& relativePath, Data::Asset<RPI::StreamingImageAsset>& configurationAsset);
+
             // property change notifications
             AZ::Outcome<void, AZStd::string> OnProbeSpacingValidateX(void* newValue, const AZ::Uuid& valueType);
             AZ::Outcome<void, AZStd::string> OnProbeSpacingValidateY(void* newValue, const AZ::Uuid& valueType);
@@ -53,6 +69,13 @@ namespace AZ
             AZ::u32 OnAmbientMultiplierChanged();
             AZ::u32 OnViewBiasChanged();
             AZ::u32 OnNormalBiasChanged();
+            AZ::u32 OnEditorModeChanged();
+            AZ::u32 OnRuntimeModeChanged();
+            AZ::Outcome<void, AZStd::string> OnModeChangeValidate(void* newValue, const AZ::Uuid& valueType);
+
+            // Button handler
+            AZ::u32 BakeDiffuseProbeGrid();
+            AZ::u32 GetBakeDiffuseProbeGridVisibilitySetting();
 
             // properties
             float m_probeSpacingX = DefaultDiffuseProbeGridSpacing;
@@ -61,6 +84,12 @@ namespace AZ
             float m_ambientMultiplier = DefaultDiffuseProbeGridAmbientMultiplier;
             float m_viewBias = DefaultDiffuseProbeGridViewBias;
             float m_normalBias = DefaultDiffuseProbeGridNormalBias;
+            DiffuseProbeGridMode m_editorMode = DiffuseProbeGridMode::RealTime;
+            DiffuseProbeGridMode m_runtimeMode = DiffuseProbeGridMode::RealTime;
+
+            // flags
+            bool m_editorModeSet = false;
+            AZStd::atomic_bool m_bakeInProgress = false;
         };
     } // namespace Render
 } // namespace AZ
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
index 2c44124564..72cc765238 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp
@@ -228,7 +228,7 @@ namespace AZ
 
             // remove scale
             Transform worldNoScale = world;
-            worldNoScale.ExtractScale();
+            worldNoScale.ExtractUniformScale();
             
             AZ::Matrix3x4 transformMatrix = AZ::Matrix3x4::CreateFromTransform(worldNoScale);
             transformMatrix.StoreToRowMajorFloat12(matrix);
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
index 4a6b1608a4..192c1ad509 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp
@@ -218,7 +218,7 @@ namespace AZ
         SunPosition PhysicalSkyComponentController::GetSunTransform(const AZ::Transform& world)
         {
             Transform worldNoScale = world;
-            worldNoScale.ExtractScale();
+            worldNoScale.ExtractUniformScale();
             AZ::Vector3 sunPositionAtom = worldNoScale.TransformVector(AZ::Vector3(0, -1, 0)); // transform Sun from default position
 
             // Convert sun position to Y-up coordinate
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
index bad7c2fe38..ef82792f32 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Thumbnails/Rendering/ThumbnailRendererSteps/ReleaseResourcesStep.cpp
@@ -32,32 +32,29 @@ namespace AZ
 
             void ReleaseResourcesStep::Start()
             {
-                m_context->GetData()->m_defaultMaterialAsset.Release();
-                m_context->GetData()->m_defaultModelAsset.Release();
-                m_context->GetData()->m_materialAsset.Release();
-                m_context->GetData()->m_modelAsset.Release();
+                auto data = m_context->GetData();
+                
+                data->m_defaultMaterialAsset.Release();
+                data->m_defaultModelAsset.Release();
+                data->m_materialAsset.Release();
+                data->m_modelAsset.Release();
+                data->m_lightingPresetAsset.Release();
 
-                if (m_context->GetData()->m_modelEntity)
+                if (data->m_modelEntity)
                 {
-                    AzFramework::EntityContextRequestBus::Event(m_context->GetData()->m_entityContext->GetContextId(),
-                        &AzFramework::EntityContextRequestBus::Events::DestroyEntity, m_context->GetData()->m_modelEntity);
-                    m_context->GetData()->m_modelEntity = nullptr;
+                    AzFramework::EntityContextRequestBus::Event(data->m_entityContext->GetContextId(),
+                        &AzFramework::EntityContextRequestBus::Events::DestroyEntity, data->m_modelEntity);
+                    data->m_modelEntity = nullptr;
                 }
 
-                m_context->GetData()->m_frameworkScene->UnsetSubsystem<RPI::Scene>();
-
-                m_context->GetData()->m_scene->Deactivate();
-                m_context->GetData()->m_scene->RemoveRenderPipeline(m_context->GetData()->m_renderPipeline->GetId());
-                RPI::RPISystemInterface::Get()->UnregisterScene(m_context->GetData()->m_scene);
-
-                auto sceneSystem = AzFramework::SceneSystemInterface::Get();
-                AZ_Assert(sceneSystem, "Thumbnail system failed to get scene system implementation.");
-                [[maybe_unused]] bool sceneRemovedSuccessfully = sceneSystem->RemoveScene(m_context->GetData()->m_sceneName);
-                AZ_Assert(
-                    sceneRemovedSuccessfully, "Thumbnail system was unable to remove scene '%s' from the scene system.",
-                    m_context->GetData()->m_sceneName.c_str());
-                m_context->GetData()->m_scene = nullptr;
-                m_context->GetData()->m_renderPipeline = nullptr;
+                data->m_scene->Deactivate();
+                data->m_scene->RemoveRenderPipeline(data->m_renderPipeline->GetId());
+                RPI::RPISystemInterface::Get()->UnregisterScene(data->m_scene);
+                data->m_frameworkScene->UnsetSubsystem(data->m_scene);
+                data->m_frameworkScene->UnsetSubsystem(data->m_entityContext.get());
+                data->m_scene = nullptr;
+                data->m_frameworkScene = nullptr;
+                data->m_renderPipeline = nullptr;
             }
         } // namespace Thumbnails
     } // namespace LyIntegration
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/3rdParty/Python/.gitignore b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/3rdParty/Python/.gitignore
new file mode 100644
index 0000000000..f1a223f90e
--- /dev/null
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/3rdParty/Python/.gitignore
@@ -0,0 +1 @@
+pyside2-tools
\ No newline at end of file
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
index 6fd8b03e9e..06b00da981 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
@@ -81,8 +81,8 @@ settings = config.get_config_settings()
 if __name__ == '__main__':
     """Run this file as main"""
 
-    _G_DEBUG = True
-    _G_TEST_PYSIDE = True
+    _G_DEBUG = False
+    _G_TEST_PYSIDE = False
     
     _config = get_dccsi_config()
     _settings = config.get_config_settings()
@@ -121,7 +121,6 @@ if __name__ == '__main__':
             import PySide2
 
         _LOGGER.info(f'PySide2: {PySide2}')
-        _LOGGER.info(f'QTFORPYTHON_PATH: {_settings.QTFORPYTHON_PATH}')
         _LOGGER.info(f'LY_BIN_PATH: {_settings.LY_BIN_PATH}')
         _LOGGER.info(f'QT_PLUGIN_PATH: {_settings.QT_PLUGIN_PATH}')
         _LOGGER.info(f'QT_QPA_PLATFORM_PLUGIN_PATH: {_settings.QT_QPA_PLATFORM_PLUGIN_PATH}')
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
index 4a64c43029..ab0708defd 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
@@ -68,14 +68,17 @@ IF "%DEV_REL_PATH%"=="" (set DEV_REL_PATH=..\..\..\..)
 echo     DEV_REL_PATH = %DEV_REL_PATH%
 
 :: You can define the project name
-:: if not defined we just use the DCCsi path as standin
-IF "%LY_PROJECT%"=="" (
-    for %%a in (%CD%..\..\..) do set LY_PROJECT=%%~na
+IF "%LY_PROJECT_NAME%"=="" (
+    for %%a in (%CD%..\..\..) do set LY_PROJECT_NAME=%%~na
         )
+echo     LY_PROJECT_NAME = %LY_PROJECT_NAME%
+
+:: if not defined we just use the DCCsi path as stand-in
+IF "%LY_PROJECT%"=="" (set LY_PROJECT=%CD%)
 echo     LY_PROJECT = %LY_PROJECT%
 
 :: set up the default project path (dccsi)
-:: if not set we lso use the DCCsi path as standin
+:: if not set we also use the DCCsi path as stand-in
 CD /D ..\..\
 IF "%LY_PROJECT_PATH%"=="" (set LY_PROJECT_PATH=%CD%)
 echo     LY_PROJECT_PATH = %LY_PROJECT_PATH%
@@ -88,7 +91,7 @@ pushd %ABS_PATH%
 
 :: Change to root Lumberyard dev dir
 CD /d %LY_PROJECT_PATH%\%DEV_REL_PATH%
-set LY_DEV=%CD%
+IF "%LY_DEV%"=="" (set LY_DEV=%CD%)
 echo     LY_DEV = %LY_DEV%
 :: Restore original directory
 popd
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
index cc090d922f..21882f3d96 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
@@ -29,7 +29,7 @@ A general goal of the DCCsi is be self-maintained, and to not taint the users in
 So we boostrap additional access to site-packages in our userSetup.py:
 "C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\Scripts\userSetup.py"
 
-We don't want users to have to install or use Python2.7 although with maya and possibly other dcc tools we don't have that control.  Maya still is on Python2.7, so instead of forcing another install of python we can just use mayapy to manage extensions.
+We don't want users to have to install or use Python2.7 although with maya and possibly other dcc tools we don't have that control.  Maya 2020 and earlier versions are still on Python2.7, so instead of forcing another install of python we can just use mayapy to manage extensions.
 
 Pip may already be installed, you can check like so (your maya install path may be different):
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
index 8fd084dac8..ceb5be4dea 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
@@ -4,14 +4,14 @@
 #
 #    pip-compile --generate-hashes requirements.txt
 #
-cachetools==3.1.1 \
-    --hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
-    --hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
-    # via -r requirements.txt
 certifi==2020.6.20 \
     --hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
     --hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41
     # via -r requirements.txt
+cachetools==3.1.1 \
+    --hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
+    --hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
+    # via -r requirements.txt
 click==7.1.2 \
     --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
     --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
@@ -68,6 +68,16 @@ unipath==1.1 \
     --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
     --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
     # via -r requirements.txt
+qdarkstyle==3.0.2 \
+    --hash=sha256:55d149cf5f40ee297397f1818e091118cefb855a4a9c5c38566c47acd2d8c7ae \
+    --hash=sha256:7c791535cc20b3cc1e8e1bf6b88dabe53cb0615983df702be83597e73ada2558
+    # via -r c:\temp\requirements.txt
+qtpy==1.9.0 \
+    --hash=sha256:2db72c44b55d0fe1407be8fba35c838ad0d6d3bb81f23007886dc1fc0f459c8d \
+    --hash=sha256:fa0b8363b363e89b2a6f49eddc162a04c0699ae95e109a6be3bb145a913190ea
+    # via
+    #   -r c:\temp\requirements.txt
+    #   qdarkstyle
 wincertstore==0.2 \
     --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
     --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
index 69e4543a59..ab2d5db480 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
@@ -83,13 +83,13 @@ _LY_DEV = os.getenv(constants.ENVAR_LY_DEV,
                                                      check_stub='engine.json'))
 
 # get/set the project name
-_LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT,
-                            config_utils.get_current_project(_LY_DEV))
+_LY_PROJECT_NAME = os.getenv(constants.ENVAR_LY_PROJECT,
+                            config_utils.get_current_project().name)
 
 # project cache log dir path
 _DCCSI_LOG_PATH = Path(os.getenv(constants.ENVAR_DCCSI_LOG_PATH,
                                  Path(_LY_DEV,
-                                      _LY_PROJECT_TAG,
+                                      _LY_PROJECT_NAME,
                                       'Cache',
                                      'pc', 'user', 'log', 'logs')))
 
@@ -223,7 +223,7 @@ if _G_DEBUG:
 _LOGGER.debug('MODULE_PATH: {}'.format(_MODULE_PATH))
 _LOGGER.debug('LY_DEV_PATH: {}'.format(_LY_DEV))
 _LOGGER.debug('DCCSI_PATH: {}'.format(_DCCSIG_PATH))
-_LOGGER.debug('LY_PROJECT_TAG: {}'.format(_LY_PROJECT_TAG))
+_LOGGER.debug('LY_PROJECT_TAG: {}'.format(_LY_PROJECT_NAME))
 _LOGGER.debug('DCCSI_LOG_PATH: {}'.format(_DCCSI_LOG_PATH))
 
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
index 9c920a871d..0a0c6b8337 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
@@ -137,8 +137,9 @@ def get_dccsi_config(dccsi_dirpath=return_stub_dir()):
 
 
 # -------------------------------------------------------------------------
-def get_current_project(dev_folder=get_stub_check_path()):
-    """Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str"""
+def get_current_project_cfg(dev_folder=get_stub_check_path()):
+    """Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str
+    Note: boostrap.cfg will be deprecated.  Don't use this method anymore."""
     boostrap_filepath = Path(dev_folder, "bootstrap.cfg")
     if boostrap_filepath.exists():
         bootstrap = open(str(boostrap_filepath), "r")
@@ -153,6 +154,33 @@ def get_current_project(dev_folder=get_stub_check_path()):
 # -------------------------------------------------------------------------
 
 
+# -------------------------------------------------------------------------
+def get_current_project():
+    """Gets o3de project via .o3de data in user directory"""
+
+    from azpy.constants import PATH_USER_O3DE_BOOTSTRAP
+    from collections import OrderedDict
+    from box import Box
+    
+    bootstrap_box = None
+
+    try:
+        bootstrap_box = Box.from_json(filename=PATH_USER_O3DE_BOOTSTRAP,
+                                     encoding="utf-8",
+                                     errors="strict",
+                                     object_pairs_hook=OrderedDict)
+    except FileExistsError as e:
+        _LOGGER.error('File does not exist: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
+
+    if bootstrap_box:
+        # this seems fairly hard coded - what if the data changes?
+        project_path=Path(bootstrap_box.Amazon.AzCore.Bootstrap.project_path)
+        return project_path.resolve()
+    else:
+        return None
+# -------------------------------------------------------------------------
+
+
 # -------------------------------------------------------------------------
 def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
     """Builds and adds local site dir libs based on py version"""
@@ -194,7 +222,11 @@ if __name__ == '__main__':
 
     _LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engine.json')))
 
-    _LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('bootstrap.cfg'))))
+    # this will be deprecated and shouldn't work soon (returns None)
+    _LOGGER.info('LY_PROJECT: {}'.format(get_current_project_cfg(get_stub_check_path('bootstrap.cfg'))))
+
+    # new o3de version
+    _LOGGER.info('LY_PROJECT: {}'.format(get_current_project()))
 
     _LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub'))))
 
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
index 792f0faee6..e10221d324 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
@@ -26,6 +26,7 @@ So we can make an update here once that is used elsewhere.
 import os
 import sys
 import site
+from os.path import expanduser
 import logging as _logging
 
 # for this module to perform standalone
@@ -91,6 +92,9 @@ TAG_DIR_DCCSI_SDK = str('SDK')
 TAG_DIR_LY_BUILD = str('build')
 TAG_QT_PLUGIN_PATH = str('QT_PLUGIN_PATH')
 
+TAG_O3DE_FOLDER = str('.o3de')
+TAG_O3DE_BOOTSTRAP = str('bootstrap.setreg')
+
 # filesystem markers, stub file names.
 STUB_LY_DEV = str('engine.json')
 STUB_LY_ROOT_PROJECT = str('ly_project_stub')
@@ -221,10 +225,17 @@ TAG_DEFAULT_PY = str('Launch_pyBASE.bat')
 # config file stuff
 FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json')
 
+# new o3de related paths
+PATH_USER_O3DE = str('{home}\\{o3de}').format(home=expanduser("~"),
+                                              o3de=TAG_O3DE_FOLDER)
+PATH_USER_O3DE_REGISTRY = str('{0}\\Registry').format(PATH_USER_O3DE)
+PATH_USER_O3DE_BOOTSTRAP = str('{reg}\\{file}').format(reg=PATH_USER_O3DE_REGISTRY,
+                                                       file=TAG_O3DE_BOOTSTRAP)
+
 #python and site-dir
 TAG_DCCSI_PY_VERSION_MAJOR = str(3)
 TAG_DCCSI_PY_VERSION_MINOR = str(7)
-TAG_DCCSI_PY_VERSION_RELEASE = str(5)
+TAG_DCCSI_PY_VERSION_RELEASE = str(10)
 TAG_PYTHON_EXE = str('python.exe')
 TAG_TOOLS_DIR = str('Tools\\Python')
 TAG_PLATFORM = str('windows')
@@ -314,6 +325,7 @@ if __name__ == '__main__':
     _stash_dict['QTFORPYTHON_PATH'] = Path(PATH_QTFORPYTHON_PATH)
     _stash_dict['QT_PLUGIN_PATH'] = Path(PATH_QT_PLUGIN_PATH)
     _stash_dict['SAT_INSTALL_PATH'] = Path(PATH_SAT_INSTALL_PATH)
+    _stash_dict['PATH_USER_O3DE_BOOTSTRAP'] = Path(PATH_USER_O3DE_BOOTSTRAP)
 
     # ---------------------------------------------------------------------
     # py 2 and 3 compatible iter    
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down.png
deleted file mode 100644
index fa98bc39a3..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afe9402162c5b4527f12c863d389ee9d75b53a1069b7e177497beba389d91d35
-size 525
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_disabled.png
deleted file mode 100644
index eaedad9b31..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc1e37e22cb75f616d6ada02cce006bae7fb1da515b15afea0fc98fcc542a092
-size 547
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_focus.png
deleted file mode 100644
index 170beb53b4..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7c9c4c8c5bdc755cc026aa23044f546010c0d1e079ecba34ceb8f0eb9e44bde
-size 530
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_pressed.png
deleted file mode 100644
index 32b2aac93a..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6111d15f1dc946742b00317bda789a5c625333f65a362f38931dabc50afb2067
-size 518
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left.png
deleted file mode 100644
index e84d285f63..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ac79e7fbd6be51465e0b685dca32c1236f95ad76ab8c5877ec73d20a1de4365
-size 546
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_disabled.png
deleted file mode 100644
index d21aea9e87..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a86de88cf4ee32c352776caf46d5512d27679da8b571ea7e791287495fad4514
-size 569
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_focus.png
deleted file mode 100644
index 6315e4d488..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c5b8427bd1497006b8adbcbc445f11b07ec388a3398fe2997f65bdc56f2644f
-size 565
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_pressed.png
deleted file mode 100644
index c01c95df2b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95ad920de52fd198f1af6d569917be20dc24a39dabdbe6c555c812d424bd9736
-size 541
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right.png
deleted file mode 100644
index 7dc1534e3c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb5b2d9b40652764f074dcea9856d6748b0efeac57ef58f306efa999f4b411c1
-size 518
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_disabled.png
deleted file mode 100644
index 0bdb8963f1..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a38dcd5b4078df430fa05780844af3e88e0a8e01c1fa910482e4c217354d728
-size 553
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_focus.png
deleted file mode 100644
index 9659eeed4d..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f60b2dfce514a6f558134b942f255ddf81ca3dc77b0d899a87f6d4cbac38e26
-size 543
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_pressed.png
deleted file mode 100644
index 8e8ae64a87..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84379a7bd6ffa75692648c6fce328616e8a009d7ea3a83c2288f82ecce37e729
-size 544
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up.png
deleted file mode 100644
index 5137aa3c5f..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7ee7bfb0c60d4687c8a0dcc38a12ee7cacaa2cbb9eb0ae24faa82b992ade445
-size 512
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_disabled.png
deleted file mode 100644
index 7c866337ea..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:571b1afb9c2d7e01f56b75e1526dd0a3ffd49a60a4bcb7981ba34823b44a74c0
-size 538
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_focus.png
deleted file mode 100644
index a3eaa49ef3..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45d805ec94b8144bf121ba74ee96dd27f2f8c0890b2eca5e78df39cb5266f94d
-size 530
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_pressed.png
deleted file mode 100644
index 168493204d..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d49428a947ea424fabedd5a08e1d78e0bc57dc8a2d5a231b5d9ec06977870f5a
-size 518
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon.png
deleted file mode 100644
index 0af10b0138..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
-size 1256
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_disabled.png
deleted file mode 100644
index 0af10b0138..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
-size 1256
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_focus.png
deleted file mode 100644
index 0af10b0138..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
-size 1256
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_pressed.png
deleted file mode 100644
index 0af10b0138..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
-size 1256
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed.png
deleted file mode 100644
index b964f8985a..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56776b4655640d46eb1031b9c19c2341fdfe1201c774a84bc5c2801fbcfefc37
-size 350
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_disabled.png
deleted file mode 100644
index ad619682e6..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d48862b1c68efdf376551d1c35d5d3a68e2ce9809e7c2723f42ece7c77fca009
-size 373
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_focus.png
deleted file mode 100644
index 8ea7431745..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62cc47f4b7751e22ffe4b26289ecc632b4a2c4e5c33ac79864fcfb32398b1139
-size 380
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_pressed.png
deleted file mode 100644
index 54a60293b0..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad6e74b57c8876fa28c3a43d1a38369415790507d65d758ea3e77b796c401da2
-size 372
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end.png
deleted file mode 100644
index 0fc0630627..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63324c154ead46027729bcf307ba45fbeb5a8de3ec5e8cef55d315a84a087115
-size 142
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_disabled.png
deleted file mode 100644
index 68a6b95488..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a8b091785c84d37de57aacb7fe5a9b854933cc94b9b6f1f6e0b155879c7d6d0
-size 146
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_focus.png
deleted file mode 100644
index 84307b3375..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f89a6b105df07325dcf7bdcea2165bb065dd99b648aa12ae4e0c6693e04d0a2
-size 146
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_pressed.png
deleted file mode 100644
index 3f63a24d56..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:76f44758619badecf11b3b0d9914612e584ad750a695c942811fe215457b25be
-size 146
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line.png
deleted file mode 100644
index 7aebe0ec54..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50a35383d40b4e8a646931e4057cd25045f05a48208e2cb9d9935be76b53bf94
-size 130
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_disabled.png
deleted file mode 100644
index f1b83a5734..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba7550922e9d244620f8f9ad76fe546d542764eba02378f81b188dec5fd7438a
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_focus.png
deleted file mode 100644
index 5daf190e47..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52bec8528e3c8edd583136d90a37f46bcb45e0d406fc0fb680a8b4d75cfeb731
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_pressed.png
deleted file mode 100644
index d533bb82b9..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b8d2c9a8593a52221c91d2a8c2d3cbd837e408a5f6d1dcad6f79328a13a3bcf
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more.png
deleted file mode 100644
index d0eb02b7fb..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5087f4f06a9718230e1aec2ba681f3432ecd2640a135b4e90c7b009188ec4c29
-size 155
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_disabled.png
deleted file mode 100644
index a457e2822c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dec80a2e8439a0787e10aee70a365e30b5d1f43c29e4c33989cc6cd2f5cac478
-size 162
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_focus.png
deleted file mode 100644
index 09b9726550..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39930fd3e240c9ad94d748d6cda73b2943682fc4825edd1240e882be18c06198
-size 162
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_pressed.png
deleted file mode 100644
index 31a17b26f0..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d07da719927b26db1c3087bbfe7203510fce077efe9e121935b3aefbb49b95d
-size 162
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open.png
deleted file mode 100644
index f0f49a375a..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:05a1980b268f598ebb3520067679a8beb4fa3f00da9c87dd93be2642718ceb44
-size 354
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_disabled.png
deleted file mode 100644
index d46e6138bc..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:047c00f910dd279e871a6329ea533816d8b458063539b8efbe9949d7363996bf
-size 375
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_focus.png
deleted file mode 100644
index d6c73e877c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bc79f30e3fdc52ec30eb0e9c6b03d1538f7c8c7855033d24d5f993e8ceb9cc1
-size 367
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_pressed.png
deleted file mode 100644
index ba1bb5e27b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa65cf58b8a02bf5f4142ad80de05aba868245c55a790af6ba0230bfd01a2a06
-size 369
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked.png
deleted file mode 100644
index d82af2b4ed..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:95c1c1651a13f0562383087549a35a97bbb7899c7d3717d79d4624485b72bf9f
-size 452
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_disabled.png
deleted file mode 100644
index e96b6ab274..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80a1d02e6ac7e5d0439b2a077ab8cf82739853ce46ac1556d4035e3bba713242
-size 467
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_focus.png
deleted file mode 100644
index abe4bad569..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64d5ed4d01a9778912b98c9147eb67431560acb5805d1d0832a765c441b9ed9b
-size 441
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_pressed.png
deleted file mode 100644
index 1bab094a68..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0ffa46106a643a71835056acce66ebe09745a9e6d91fac30ff1caf0589a6677
-size 418
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate.png
deleted file mode 100644
index 51d0835feb..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b291eb9180c0e27d1de6ff008ff4259b2c675a65efa94866a66c7c932fc1260
-size 581
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_disabled.png
deleted file mode 100644
index 9e13859a93..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c7d3d64e8cb5e2f8bc6620b0d58492a56800fc78fc0229a5fa495d3a43987a1
-size 614
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_focus.png
deleted file mode 100644
index aea72c9cde..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43d494685f5d2ed740b69f04fefe0e757626db94685ecc8f4411c6c68a626a5a
-size 576
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_pressed.png
deleted file mode 100644
index d2c86adef3..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7af182d82449663ac37955e45ccc3f8fc86d185649fa9bed24c10167351bd5ee
-size 563
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked.png
deleted file mode 100644
index bf34be7606..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:232451d0bd9cf1d54c777862030b667cd5078f2f4ff387ec03c44d56eb207c03
-size 397
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_disabled.png
deleted file mode 100644
index 596e553c14..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b54771eaad56ee45f8871248ee1c6b18035aa732f9e4e9257d008a73be04c25
-size 386
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_focus.png
deleted file mode 100644
index 96cf982f58..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae293d387fda8a89d68fc3f15db07ef084e3537a033d02351ff918cfcc82ea8a
-size 394
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_pressed.png
deleted file mode 100644
index 0984a1fd5d..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8ccf5cb638a090f0e64f6d336e4c6312cfaf53971afd0f00cd16d0c0759f1b4
-size 403
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal.png
deleted file mode 100644
index 4d069c17b1..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:256f010c3084112888189bcbea2995a37f8acbf12d61a4a261a94aca797cd964
-size 117
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_disabled.png
deleted file mode 100644
index 06465a0a29..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85522a94ec26125f65dcafc6158665f40ea570e4a08cbdfbbdf5f6772b887eb7
-size 121
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_focus.png
deleted file mode 100644
index 5f1332e6dd..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae4766527d9e5a2226107ede231878118538e8be89f2dc2ac92b7c5a68ad0fc6
-size 120
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_pressed.png
deleted file mode 100644
index f0f11abeb0..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f4bdbb4d207aa40366ad90d363a95d80e2b4a43574ca1ad3256ee6e0617f25e
-size 120
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical.png
deleted file mode 100644
index 7aebe0ec54..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50a35383d40b4e8a646931e4057cd25045f05a48208e2cb9d9935be76b53bf94
-size 130
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_disabled.png
deleted file mode 100644
index f1b83a5734..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ba7550922e9d244620f8f9ad76fe546d542764eba02378f81b188dec5fd7438a
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_focus.png
deleted file mode 100644
index 5daf190e47..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:52bec8528e3c8edd583136d90a37f46bcb45e0d406fc0fb680a8b4d75cfeb731
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_pressed.png
deleted file mode 100644
index d533bb82b9..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_vertical_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b8d2c9a8593a52221c91d2a8c2d3cbd837e408a5f6d1dcad6f79328a13a3bcf
-size 134
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked.png
deleted file mode 100644
index 99c9969237..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abee85006ecef454df64f65a6aa7dbb85bff9c51f53ed87b47e9f4ef1adefec3
-size 1224
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_disabled.png
deleted file mode 100644
index 13daed68f4..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e22fc4d6bf116cebab4655b6bf81b1c384789b45a96f05d8a4b535e34978cb9
-size 1325
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_focus.png
deleted file mode 100644
index e42389445a..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3db59af5ba4caa97ac07834e1a919adafdcd610324dacac68cbd2cde551c2397
-size 1293
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_pressed.png
deleted file mode 100644
index 4153bb2ed5..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_checked_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34bce34b70cf7c24d1e54f87f4225f0c4cf8e7dd8c6fd8a38f81e981bae2a2ce
-size 1276
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked.png
deleted file mode 100644
index 748ab5998b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f675766febe18edf774b0dd7db11177ca76793c0d2b693b1ffb6a447b79369d2
-size 963
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_disabled.png
deleted file mode 100644
index 34230cbb40..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d5af9296f23e58fc7fde5c9b278a801bd51bb3650d0e5f84dd9eb84434308cc
-size 1040
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_focus.png
deleted file mode 100644
index 3428ad46be..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0b650dda797331b8c23ece7e313babb8e6e9118bd3d53e689a7381a33cb5e00
-size 1032
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_pressed.png
deleted file mode 100644
index b60ab09f6c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/radio_unchecked_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dd40885e1d7b1d3f37cfc3afff07fe47db552602bdc46aa9a8ce7a0c8df30db
-size 1022
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal.png
deleted file mode 100644
index ad5243fcb8..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:054d47979c0879378a6f5e36d9e5b251c31e15610adeed109b8f128115d4b5ec
-size 150
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_disabled.png
deleted file mode 100644
index 94ef75054c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9eca88a1ebba5d42107da4c3b3af3b52a8de1c76bc1bae8d27190ff5e69f8198
-size 155
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_focus.png
deleted file mode 100644
index c4fe22a169..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e11a73fcc79cebd854cbdf3c6539eca99b016440c590b5326f90fa9790e9a69d
-size 154
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_pressed.png
deleted file mode 100644
index e6d3f5a2c6..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_horizontal_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7371a89813b6f4843dc90b4abe866de943ba670057e0802dcc7f0284d9aa079b
-size 154
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical.png
deleted file mode 100644
index 6f47c7e52c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e4d88b8da4d94d4ecaa0eda448d18adcad14c5a62d4e6c9d0ffb2673683d855
-size 137
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_disabled.png
deleted file mode 100644
index 43b5911860..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7422317ab56297babc9025f42dd1f7179588ac4e066cb1b976b1bb56efca656
-size 140
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_focus.png
deleted file mode 100644
index 0b918dcdc9..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9a1520ad62a2b20f53c0709d643af3e8e0d775891597c4bc05e46ed75617bd9
-size 144
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_pressed.png
deleted file mode 100644
index 7b104f52b0..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_move_vertical_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:73b0e2dddb1c22848b9b858975cdaae02f0b7b47696922a863358afa30f81dfa
-size 143
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal.png
deleted file mode 100644
index e7174cd081..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2986d7bca86f3359817f002ecf125afab71281561925a6ecbffe844a2be9699
-size 145
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_disabled.png
deleted file mode 100644
index b45f02655c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f7909f6aa1843cb2382ea0e49afb10967a331e128cc8103ab8082c3e46a90aa
-size 151
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_focus.png
deleted file mode 100644
index e2898bd5bf..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4c628767e58d08e929a4bfc3f730e1347b186a44a1b0d4159fa722776a660ea
-size 149
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_pressed.png
deleted file mode 100644
index 3a71bdc89e..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_horizontal_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2bcf16dee85252fbf33d3eb05009b988f4c7b3795c01d66e471712d76def3ab
-size 149
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical.png
deleted file mode 100644
index 02c38086c4..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5db0c6a32f562204a4dc77c8958ef29e016af621f11891ca1795da808a879288
-size 133
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_disabled.png
deleted file mode 100644
index f9b739bb93..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c705854e5a7aae10edb4d0cd28d1217a0b6599845031053d502aa05030ce5134
-size 135
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_focus.png
deleted file mode 100644
index 08661141b3..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39bd3c687b5bc56d6a62728d3dbfa522f3e1e74ec4de752987768f60c947adf5
-size 139
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_pressed.png
deleted file mode 100644
index 5baf760e59..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/toolbar_separator_vertical_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0966303eb702647e3463ffa644611d817741b1ee0d016ecd56c600e9f04ac114
-size 138
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent.png
deleted file mode 100644
index 02ade9b47b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17cedbceacd7ae3a97319a3db9606b40d8ef31428828b08bdbfe73f5642b4ae5
-size 104
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_disabled.png
deleted file mode 100644
index 02ade9b47b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17cedbceacd7ae3a97319a3db9606b40d8ef31428828b08bdbfe73f5642b4ae5
-size 104
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_focus.png
deleted file mode 100644
index 02ade9b47b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17cedbceacd7ae3a97319a3db9606b40d8ef31428828b08bdbfe73f5642b4ae5
-size 104
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_pressed.png
deleted file mode 100644
index 02ade9b47b..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/transparent_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17cedbceacd7ae3a97319a3db9606b40d8ef31428828b08bdbfe73f5642b4ae5
-size 104
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close.png
deleted file mode 100644
index dd99b7b8ed..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7b31e2fb43e9c3dbd9f0e32680422a7d8c8e7ff7cd600e446103e45b0df0523
-size 766
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_disabled.png
deleted file mode 100644
index 1f506f9543..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:528a22b6955681f34373fc72a2dfdd19e6255e18c73f0804c09b34ea01c1f0a0
-size 838
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_focus.png
deleted file mode 100644
index 244b91f5b8..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bbc009bf89ac37957e2ff6532a9328f71e63f5edb45bd918048c8a69f61a72e2
-size 756
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_pressed.png
deleted file mode 100644
index 4a45bda1b2..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_close_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd117b3874dec17ebf78f136784eca821f4d916fe34081187c8c28bc2223f545
-size 745
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip.png
deleted file mode 100644
index 0f176f5949..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c2ebc9c32505a0489879f7429034143af2ed48e71d2b2eba449a45c7253a2b7
-size 426
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_disabled.png
deleted file mode 100644
index f07d5f0de8..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e7ffdf7643cd2078127953690098b8ea8899428f7906efa778d70422d254f1e
-size 447
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_focus.png
deleted file mode 100644
index d7271e6e0a..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:055a219ffe9015ed50585caa1cedd31cb99c034c41c17f3ff97cc3c9a1b9b68c
-size 435
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_pressed.png
deleted file mode 100644
index 000da02699..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_grip_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:776e4b8d509743bb682783085bd139ad8e419a1bbc02a93480b1a4aaffd89041
-size 444
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize.png
deleted file mode 100644
index 1846176c40..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ddd70f8069320fb09ee8800cecaa190076baaa4b1c251900220541cc83434bd
-size 193
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_disabled.png
deleted file mode 100644
index d9df85b122..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4bc0af0fc3119eb066333d3c3e4fbdcc65e23bfdb43b5c5dfd65aae7b6916b3b
-size 206
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_focus.png
deleted file mode 100644
index 30a7f49ed0..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7575b3458ef002ebfe1fece1427dd3170326d35144b0d03f215d091f625f7286
-size 208
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_pressed.png
deleted file mode 100644
index 9cd26589f5..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_minimize_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3dd9475a6db26f45e85d5a688a5e724b7278af4d472caf4b16c1fde346f95db
-size 202
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock.png
deleted file mode 100644
index 8126d26228..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b07a032c3109f93770c149c4b3199c17cc446e58e50b0d86c4254268a3dc00b0
-size 510
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_disabled.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_disabled.png
deleted file mode 100644
index 573cd467ed..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_disabled.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c97ecbc47699b4ec1189831ae2b8f08eed95e96def84ea48ac63597ecd3d40a
-size 541
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_focus.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_focus.png
deleted file mode 100644
index 5044d402af..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_focus.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ed098cc564cc6c45cdf43103f06a670089149cbc4e81a733becd49d6d115d44
-size 519
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_pressed.png b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_pressed.png
deleted file mode 100644
index be8c5637dd..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/window_undock_pressed.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef37bb94ebabd4d37ed1c8fcd5a095a5d10e2a20a667861d13c772b903c32bb1
-size 523
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/readme.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/readme.txt
deleted file mode 100644
index e100551564..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-LICENSE
-https://github.com/ColinDuquesnoy/QDarkStyleSheet/blob/master/LICENSE.rst
-
-DEPOT
-https://github.com/ColinDuquesnoy/QDarkStyleSheet
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qrc b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qrc
deleted file mode 100644
index e301854e2c..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qrc
+++ /dev/null
@@ -1,216 +0,0 @@
-
-<RCC warning="File created programmatically. All changes made in this file will be lost!">
-  <qresource prefix="qss_icons">
-    <file>rc/arrow_down.png</file>
-    <file>rc/arrow_down@2x.png</file>
-    <file>rc/arrow_down_disabled.png</file>
-    <file>rc/arrow_down_disabled@2x.png</file>
-    <file>rc/arrow_down_focus.png</file>
-    <file>rc/arrow_down_focus@2x.png</file>
-    <file>rc/arrow_down_pressed.png</file>
-    <file>rc/arrow_down_pressed@2x.png</file>
-    <file>rc/arrow_left.png</file>
-    <file>rc/arrow_left@2x.png</file>
-    <file>rc/arrow_left_disabled.png</file>
-    <file>rc/arrow_left_disabled@2x.png</file>
-    <file>rc/arrow_left_focus.png</file>
-    <file>rc/arrow_left_focus@2x.png</file>
-    <file>rc/arrow_left_pressed.png</file>
-    <file>rc/arrow_left_pressed@2x.png</file>
-    <file>rc/arrow_right.png</file>
-    <file>rc/arrow_right@2x.png</file>
-    <file>rc/arrow_right_disabled.png</file>
-    <file>rc/arrow_right_disabled@2x.png</file>
-    <file>rc/arrow_right_focus.png</file>
-    <file>rc/arrow_right_focus@2x.png</file>
-    <file>rc/arrow_right_pressed.png</file>
-    <file>rc/arrow_right_pressed@2x.png</file>
-    <file>rc/arrow_up.png</file>
-    <file>rc/arrow_up@2x.png</file>
-    <file>rc/arrow_up_disabled.png</file>
-    <file>rc/arrow_up_disabled@2x.png</file>
-    <file>rc/arrow_up_focus.png</file>
-    <file>rc/arrow_up_focus@2x.png</file>
-    <file>rc/arrow_up_pressed.png</file>
-    <file>rc/arrow_up_pressed@2x.png</file>
-    <file>rc/base_icon.png</file>
-    <file>rc/base_icon@2x.png</file>
-    <file>rc/base_icon_disabled.png</file>
-    <file>rc/base_icon_disabled@2x.png</file>
-    <file>rc/base_icon_focus.png</file>
-    <file>rc/base_icon_focus@2x.png</file>
-    <file>rc/base_icon_pressed.png</file>
-    <file>rc/base_icon_pressed@2x.png</file>
-    <file>rc/branch_closed.png</file>
-    <file>rc/branch_closed@2x.png</file>
-    <file>rc/branch_closed_disabled.png</file>
-    <file>rc/branch_closed_disabled@2x.png</file>
-    <file>rc/branch_closed_focus.png</file>
-    <file>rc/branch_closed_focus@2x.png</file>
-    <file>rc/branch_closed_pressed.png</file>
-    <file>rc/branch_closed_pressed@2x.png</file>
-    <file>rc/branch_end.png</file>
-    <file>rc/branch_end@2x.png</file>
-    <file>rc/branch_end_disabled.png</file>
-    <file>rc/branch_end_disabled@2x.png</file>
-    <file>rc/branch_end_focus.png</file>
-    <file>rc/branch_end_focus@2x.png</file>
-    <file>rc/branch_end_pressed.png</file>
-    <file>rc/branch_end_pressed@2x.png</file>
-    <file>rc/branch_line.png</file>
-    <file>rc/branch_line@2x.png</file>
-    <file>rc/branch_line_disabled.png</file>
-    <file>rc/branch_line_disabled@2x.png</file>
-    <file>rc/branch_line_focus.png</file>
-    <file>rc/branch_line_focus@2x.png</file>
-    <file>rc/branch_line_pressed.png</file>
-    <file>rc/branch_line_pressed@2x.png</file>
-    <file>rc/branch_more.png</file>
-    <file>rc/branch_more@2x.png</file>
-    <file>rc/branch_more_disabled.png</file>
-    <file>rc/branch_more_disabled@2x.png</file>
-    <file>rc/branch_more_focus.png</file>
-    <file>rc/branch_more_focus@2x.png</file>
-    <file>rc/branch_more_pressed.png</file>
-    <file>rc/branch_more_pressed@2x.png</file>
-    <file>rc/branch_open.png</file>
-    <file>rc/branch_open@2x.png</file>
-    <file>rc/branch_open_disabled.png</file>
-    <file>rc/branch_open_disabled@2x.png</file>
-    <file>rc/branch_open_focus.png</file>
-    <file>rc/branch_open_focus@2x.png</file>
-    <file>rc/branch_open_pressed.png</file>
-    <file>rc/branch_open_pressed@2x.png</file>
-    <file>rc/checkbox_checked.png</file>
-    <file>rc/checkbox_checked@2x.png</file>
-    <file>rc/checkbox_checked_disabled.png</file>
-    <file>rc/checkbox_checked_disabled@2x.png</file>
-    <file>rc/checkbox_checked_focus.png</file>
-    <file>rc/checkbox_checked_focus@2x.png</file>
-    <file>rc/checkbox_checked_pressed.png</file>
-    <file>rc/checkbox_checked_pressed@2x.png</file>
-    <file>rc/checkbox_indeterminate.png</file>
-    <file>rc/checkbox_indeterminate@2x.png</file>
-    <file>rc/checkbox_indeterminate_disabled.png</file>
-    <file>rc/checkbox_indeterminate_disabled@2x.png</file>
-    <file>rc/checkbox_indeterminate_focus.png</file>
-    <file>rc/checkbox_indeterminate_focus@2x.png</file>
-    <file>rc/checkbox_indeterminate_pressed.png</file>
-    <file>rc/checkbox_indeterminate_pressed@2x.png</file>
-    <file>rc/checkbox_unchecked.png</file>
-    <file>rc/checkbox_unchecked@2x.png</file>
-    <file>rc/checkbox_unchecked_disabled.png</file>
-    <file>rc/checkbox_unchecked_disabled@2x.png</file>
-    <file>rc/checkbox_unchecked_focus.png</file>
-    <file>rc/checkbox_unchecked_focus@2x.png</file>
-    <file>rc/checkbox_unchecked_pressed.png</file>
-    <file>rc/checkbox_unchecked_pressed@2x.png</file>
-    <file>rc/line_horizontal.png</file>
-    <file>rc/line_horizontal@2x.png</file>
-    <file>rc/line_horizontal_disabled.png</file>
-    <file>rc/line_horizontal_disabled@2x.png</file>
-    <file>rc/line_horizontal_focus.png</file>
-    <file>rc/line_horizontal_focus@2x.png</file>
-    <file>rc/line_horizontal_pressed.png</file>
-    <file>rc/line_horizontal_pressed@2x.png</file>
-    <file>rc/line_vertical.png</file>
-    <file>rc/line_vertical@2x.png</file>
-    <file>rc/line_vertical_disabled.png</file>
-    <file>rc/line_vertical_disabled@2x.png</file>
-    <file>rc/line_vertical_focus.png</file>
-    <file>rc/line_vertical_focus@2x.png</file>
-    <file>rc/line_vertical_pressed.png</file>
-    <file>rc/line_vertical_pressed@2x.png</file>
-    <file>rc/radio_checked.png</file>
-    <file>rc/radio_checked@2x.png</file>
-    <file>rc/radio_checked_disabled.png</file>
-    <file>rc/radio_checked_disabled@2x.png</file>
-    <file>rc/radio_checked_focus.png</file>
-    <file>rc/radio_checked_focus@2x.png</file>
-    <file>rc/radio_checked_pressed.png</file>
-    <file>rc/radio_checked_pressed@2x.png</file>
-    <file>rc/radio_unchecked.png</file>
-    <file>rc/radio_unchecked@2x.png</file>
-    <file>rc/radio_unchecked_disabled.png</file>
-    <file>rc/radio_unchecked_disabled@2x.png</file>
-    <file>rc/radio_unchecked_focus.png</file>
-    <file>rc/radio_unchecked_focus@2x.png</file>
-    <file>rc/radio_unchecked_pressed.png</file>
-    <file>rc/radio_unchecked_pressed@2x.png</file>
-    <file>rc/toolbar_move_horizontal.png</file>
-    <file>rc/toolbar_move_horizontal@2x.png</file>
-    <file>rc/toolbar_move_horizontal_disabled.png</file>
-    <file>rc/toolbar_move_horizontal_disabled@2x.png</file>
-    <file>rc/toolbar_move_horizontal_focus.png</file>
-    <file>rc/toolbar_move_horizontal_focus@2x.png</file>
-    <file>rc/toolbar_move_horizontal_pressed.png</file>
-    <file>rc/toolbar_move_horizontal_pressed@2x.png</file>
-    <file>rc/toolbar_move_vertical.png</file>
-    <file>rc/toolbar_move_vertical@2x.png</file>
-    <file>rc/toolbar_move_vertical_disabled.png</file>
-    <file>rc/toolbar_move_vertical_disabled@2x.png</file>
-    <file>rc/toolbar_move_vertical_focus.png</file>
-    <file>rc/toolbar_move_vertical_focus@2x.png</file>
-    <file>rc/toolbar_move_vertical_pressed.png</file>
-    <file>rc/toolbar_move_vertical_pressed@2x.png</file>
-    <file>rc/toolbar_separator_horizontal.png</file>
-    <file>rc/toolbar_separator_horizontal@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_disabled.png</file>
-    <file>rc/toolbar_separator_horizontal_disabled@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_focus.png</file>
-    <file>rc/toolbar_separator_horizontal_focus@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_pressed.png</file>
-    <file>rc/toolbar_separator_horizontal_pressed@2x.png</file>
-    <file>rc/toolbar_separator_vertical.png</file>
-    <file>rc/toolbar_separator_vertical@2x.png</file>
-    <file>rc/toolbar_separator_vertical_disabled.png</file>
-    <file>rc/toolbar_separator_vertical_disabled@2x.png</file>
-    <file>rc/toolbar_separator_vertical_focus.png</file>
-    <file>rc/toolbar_separator_vertical_focus@2x.png</file>
-    <file>rc/toolbar_separator_vertical_pressed.png</file>
-    <file>rc/toolbar_separator_vertical_pressed@2x.png</file>
-    <file>rc/transparent.png</file>
-    <file>rc/transparent@2x.png</file>
-    <file>rc/transparent_disabled.png</file>
-    <file>rc/transparent_disabled@2x.png</file>
-    <file>rc/transparent_focus.png</file>
-    <file>rc/transparent_focus@2x.png</file>
-    <file>rc/transparent_pressed.png</file>
-    <file>rc/transparent_pressed@2x.png</file>
-    <file>rc/window_close.png</file>
-    <file>rc/window_close@2x.png</file>
-    <file>rc/window_close_disabled.png</file>
-    <file>rc/window_close_disabled@2x.png</file>
-    <file>rc/window_close_focus.png</file>
-    <file>rc/window_close_focus@2x.png</file>
-    <file>rc/window_close_pressed.png</file>
-    <file>rc/window_close_pressed@2x.png</file>
-    <file>rc/window_grip.png</file>
-    <file>rc/window_grip@2x.png</file>
-    <file>rc/window_grip_disabled.png</file>
-    <file>rc/window_grip_disabled@2x.png</file>
-    <file>rc/window_grip_focus.png</file>
-    <file>rc/window_grip_focus@2x.png</file>
-    <file>rc/window_grip_pressed.png</file>
-    <file>rc/window_grip_pressed@2x.png</file>
-    <file>rc/window_minimize.png</file>
-    <file>rc/window_minimize@2x.png</file>
-    <file>rc/window_minimize_disabled.png</file>
-    <file>rc/window_minimize_disabled@2x.png</file>
-    <file>rc/window_minimize_focus.png</file>
-    <file>rc/window_minimize_focus@2x.png</file>
-    <file>rc/window_minimize_pressed.png</file>
-    <file>rc/window_minimize_pressed@2x.png</file>
-    <file>rc/window_undock.png</file>
-    <file>rc/window_undock@2x.png</file>
-    <file>rc/window_undock_disabled.png</file>
-    <file>rc/window_undock_disabled@2x.png</file>
-    <file>rc/window_undock_focus.png</file>
-    <file>rc/window_undock_focus@2x.png</file>
-    <file>rc/window_undock_pressed.png</file>
-    <file>rc/window_undock_pressed@2x.png</file>
-  </qresource>
-  <qresource prefix="qdarkstyle">
-      <file>style.qss</file>
-  </qresource>
-</RCC>
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qss b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qss
deleted file mode 100644
index 55dfe093d9..0000000000
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/style.qss
+++ /dev/null
@@ -1,2165 +0,0 @@
-/* ---------------------------------------------------------------------------
-
-    Created by the qtsass compiler v0.1.1
-
-    The definitions are in the "qdarkstyle.qss._styles.scss" module
-
-    WARNING! All changes made in this file will be lost!
-
---------------------------------------------------------------------------- */
-/* QDarkStyleSheet -----------------------------------------------------------
-
-This is the main style sheet, the palette has nine colors.
-
-It is based on three selecting colors, three greyish (background) colors
-plus three whitish (foreground) colors. Each set of widgets of the same
-type have a header like this:
-
-    ------------------
-    GroupName --------
-    ------------------
-
-And each widget is separated with a header like this:
-
-    QWidgetName ------
-
-This makes more easy to find and change some css field. The basic
-configuration is described bellow.
-
-    BACKGROUND -----------
-
-        Light   (unpressed)
-        Normal  (border, disabled, pressed, checked, toolbars, menus)
-        Dark    (background)
-
-    FOREGROUND -----------
-
-        Light   (texts/labels)
-        Normal  (not used yet)
-        Dark    (disabled texts)
-
-    SELECTION ------------
-
-        Light  (selection/hover/active)
-        Normal (selected)
-        Dark   (selected disabled)
-
-If a stranger configuration is required because of a bugfix or anything
-else, keep the comment on the line above so nobody changes it, including the
-issue number.
-
-*/
-/*
-
-See Qt documentation:
-
-  - https://doc.qt.io/qt-5/stylesheet.html
-  - https://doc.qt.io/qt-5/stylesheet-reference.html
-  - https://doc.qt.io/qt-5/stylesheet-examples.html
-
---------------------------------------------------------------------------- */
-/* QWidget ----------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QWidget {
-  background-color: #19232D;
-  border: 0px solid #32414B;
-  padding: 0px;
-  color: #F0F0F0;
-  selection-background-color: #1464A0;
-  selection-color: #F0F0F0;
-}
-
-QWidget:disabled {
-  background-color: #19232D;
-  color: #787878;
-  selection-background-color: #14506E;
-  selection-color: #787878;
-}
-
-QWidget::item:selected {
-  background-color: #1464A0;
-}
-
-QWidget::item:hover {
-  background-color: #148CD2;
-  color: #32414B;
-}
-
-/* QMainWindow ------------------------------------------------------------
-
-This adjusts the splitter in the dock widget, not qsplitter
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow
-
---------------------------------------------------------------------------- */
-QMainWindow::separator {
-  background-color: #32414B;
-  border: 0px solid #19232D;
-  spacing: 0px;
-  padding: 2px;
-}
-
-QMainWindow::separator:hover {
-  background-color: #505F69;
-  border: 0px solid #148CD2;
-}
-
-QMainWindow::separator:horizontal {
-  width: 5px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  image: url(":/qss_icons/rc/toolbar_separator_vertical.png");
-}
-
-QMainWindow::separator:vertical {
-  height: 5px;
-  margin-left: 2px;
-  margin-right: 2px;
-  image: url(":/qss_icons/rc/toolbar_separator_horizontal.png");
-}
-
-/* QToolTip ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip
-
---------------------------------------------------------------------------- */
-QToolTip {
-  background-color: #148CD2;
-  border: 1px solid #19232D;
-  color: #19232D;
-  /* Remove padding, for fix combo box tooltip */
-  padding: 0px;
-  /* Remove opacity, fix #174 - may need to use RGBA */
-}
-
-/* QStatusBar -------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
-
---------------------------------------------------------------------------- */
-QStatusBar {
-  border: 1px solid #32414B;
-  /* Fixes Spyder #9120, #9121 */
-  background: #32414B;
-  /* Fixes #205, white vertical borders separating items */
-}
-
-QStatusBar::item {
-  border: none;
-}
-
-QStatusBar QToolTip {
-  background-color: #148CD2;
-  border: 1px solid #19232D;
-  color: #19232D;
-  /* Remove padding, for fix combo box tooltip */
-  padding: 0px;
-  /* Reducing transparency to read better */
-  opacity: 230;
-}
-
-QStatusBar QLabel {
-  /* Fixes Spyder #9120, #9121 */
-  background: transparent;
-}
-
-/* QCheckBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
-
---------------------------------------------------------------------------- */
-QCheckBox {
-  background-color: #19232D;
-  color: #F0F0F0;
-  spacing: 4px;
-  outline: none;
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-QCheckBox:focus {
-  border: none;
-}
-
-QCheckBox QWidget:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-QCheckBox::indicator {
-  margin-left: 4px;
-  height: 16px;
-  width: 16px;
-}
-
-QCheckBox::indicator:unchecked {
-  image: url(":/qss_icons/rc/checkbox_unchecked.png");
-}
-
-QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
-  border: none;
-  image: url(":/qss_icons/rc/checkbox_unchecked_focus.png");
-}
-
-QCheckBox::indicator:unchecked:disabled {
-  image: url(":/qss_icons/rc/checkbox_unchecked_disabled.png");
-}
-
-QCheckBox::indicator:checked {
-  image: url(":/qss_icons/rc/checkbox_checked.png");
-}
-
-QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed {
-  border: none;
-  image: url(":/qss_icons/rc/checkbox_checked_focus.png");
-}
-
-QCheckBox::indicator:checked:disabled {
-  image: url(":/qss_icons/rc/checkbox_checked_disabled.png");
-}
-
-QCheckBox::indicator:indeterminate {
-  image: url(":/qss_icons/rc/checkbox_indeterminate.png");
-}
-
-QCheckBox::indicator:indeterminate:disabled {
-  image: url(":/qss_icons/rc/checkbox_indeterminate_disabled.png");
-}
-
-QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
-  image: url(":/qss_icons/rc/checkbox_indeterminate_focus.png");
-}
-
-/* QGroupBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
-
---------------------------------------------------------------------------- */
-QGroupBox {
-  font-weight: bold;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  padding: 4px;
-  margin-top: 16px;
-}
-
-QGroupBox::title {
-  subcontrol-origin: margin;
-  subcontrol-position: top left;
-  left: 3px;
-  padding-left: 3px;
-  padding-right: 5px;
-  padding-top: 8px;
-  padding-bottom: 16px;
-}
-
-QGroupBox::indicator {
-  margin-left: 2px;
-  height: 12px;
-  width: 12px;
-}
-
-QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
-  border: none;
-  image: url(":/qss_icons/rc/checkbox_unchecked_focus.png");
-}
-
-QGroupBox::indicator:unchecked:disabled {
-  image: url(":/qss_icons/rc/checkbox_unchecked_disabled.png");
-}
-
-QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
-  border: none;
-  image: url(":/qss_icons/rc/checkbox_checked_focus.png");
-}
-
-QGroupBox::indicator:checked:disabled {
-  image: url(":/qss_icons/rc/checkbox_checked_disabled.png");
-}
-
-/* QRadioButton -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton
-
---------------------------------------------------------------------------- */
-QRadioButton {
-  background-color: #19232D;
-  color: #F0F0F0;
-  spacing: 4px;
-  padding: 0px;
-  border: none;
-  outline: none;
-}
-
-QRadioButton:focus {
-  border: none;
-}
-
-QRadioButton:disabled {
-  background-color: #19232D;
-  color: #787878;
-  border: none;
-  outline: none;
-}
-
-QRadioButton QWidget {
-  background-color: #19232D;
-  color: #F0F0F0;
-  spacing: 0px;
-  padding: 0px;
-  outline: none;
-  border: none;
-}
-
-QRadioButton::indicator {
-  border: none;
-  outline: none;
-  margin-left: 4px;
-  height: 16px;
-  width: 16px;
-}
-
-QRadioButton::indicator:unchecked {
-  image: url(":/qss_icons/rc/radio_unchecked.png");
-}
-
-QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, QRadioButton::indicator:unchecked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/rc/radio_unchecked_focus.png");
-}
-
-QRadioButton::indicator:unchecked:disabled {
-  image: url(":/qss_icons/rc/radio_unchecked_disabled.png");
-}
-
-QRadioButton::indicator:checked {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/rc/radio_checked.png");
-}
-
-QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, QRadioButton::indicator:checked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/rc/radio_checked_focus.png");
-}
-
-QRadioButton::indicator:checked:disabled {
-  outline: none;
-  image: url(":/qss_icons/rc/radio_checked_disabled.png");
-}
-
-/* QMenuBar ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
-
---------------------------------------------------------------------------- */
-QMenuBar {
-  background-color: #32414B;
-  padding: 2px;
-  border: 1px solid #19232D;
-  color: #F0F0F0;
-}
-
-QMenuBar:focus {
-  border: 1px solid #148CD2;
-}
-
-QMenuBar::item {
-  background: transparent;
-  padding: 4px;
-}
-
-QMenuBar::item:selected {
-  padding: 4px;
-  background: transparent;
-  border: 0px solid #32414B;
-}
-
-QMenuBar::item:pressed {
-  padding: 4px;
-  border: 0px solid #32414B;
-  background-color: #148CD2;
-  color: #F0F0F0;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-/* QMenu ------------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
-
---------------------------------------------------------------------------- */
-QMenu {
-  border: 0px solid #32414B;
-  color: #F0F0F0;
-  margin: 0px;
-}
-
-QMenu::separator {
-  height: 1px;
-  background-color: #505F69;
-  color: #F0F0F0;
-}
-
-QMenu::icon {
-  margin: 0px;
-  padding-left: 8px;
-}
-
-QMenu::item {
-  background-color: #32414B;
-  padding: 4px 24px 4px 24px;
-  /* Reserve space for selection border */
-  border: 1px transparent #32414B;
-}
-
-QMenu::item:selected {
-  color: #F0F0F0;
-}
-
-QMenu::indicator {
-  width: 12px;
-  height: 12px;
-  padding-left: 6px;
-  /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
-  /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
-}
-
-QMenu::indicator:non-exclusive:unchecked {
-  image: url(":/qss_icons/rc/checkbox_unchecked.png");
-}
-
-QMenu::indicator:non-exclusive:unchecked:selected {
-  image: url(":/qss_icons/rc/checkbox_unchecked_disabled.png");
-}
-
-QMenu::indicator:non-exclusive:checked {
-  image: url(":/qss_icons/rc/checkbox_checked.png");
-}
-
-QMenu::indicator:non-exclusive:checked:selected {
-  image: url(":/qss_icons/rc/checkbox_checked_disabled.png");
-}
-
-QMenu::indicator:exclusive:unchecked {
-  image: url(":/qss_icons/rc/radio_unchecked.png");
-}
-
-QMenu::indicator:exclusive:unchecked:selected {
-  image: url(":/qss_icons/rc/radio_unchecked_disabled.png");
-}
-
-QMenu::indicator:exclusive:checked {
-  image: url(":/qss_icons/rc/radio_checked.png");
-}
-
-QMenu::indicator:exclusive:checked:selected {
-  image: url(":/qss_icons/rc/radio_checked_disabled.png");
-}
-
-QMenu::right-arrow {
-  margin: 5px;
-  image: url(":/qss_icons/rc/arrow_right.png");
-  height: 12px;
-  width: 12px;
-}
-
-/* QAbstractItemView ------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
-
---------------------------------------------------------------------------- */
-QAbstractItemView {
-  alternate-background-color: #19232D;
-  color: #F0F0F0;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-}
-
-QAbstractItemView QLineEdit {
-  padding: 2px;
-}
-
-/* QAbstractScrollArea ----------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
-
---------------------------------------------------------------------------- */
-QAbstractScrollArea {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  padding: 2px;
-  /* fix #159 */
-  min-height: 1.25em;
-  /* fix #159 */
-  color: #F0F0F0;
-}
-
-QAbstractScrollArea:disabled {
-  color: #787878;
-}
-
-/* QScrollArea ------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QScrollArea QWidget QWidget:disabled {
-  background-color: #19232D;
-}
-
-/* QScrollBar -------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qscrollbar
-
---------------------------------------------------------------------------- */
-QScrollBar:horizontal {
-  height: 16px;
-  margin: 2px 16px 2px 16px;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  background-color: #19232D;
-}
-
-QScrollBar:vertical {
-  background-color: #19232D;
-  width: 16px;
-  margin: 16px 2px 16px 2px;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-}
-
-QScrollBar::handle:horizontal {
-  background-color: #787878;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  min-width: 8px;
-}
-
-QScrollBar::handle:horizontal:hover {
-  background-color: #148CD2;
-  border: 1px solid #148CD2;
-  border-radius: 4px;
-  min-width: 8px;
-}
-
-QScrollBar::handle:horizontal:focus {
-  border: 1px solid #1464A0;
-}
-
-QScrollBar::handle:vertical {
-  background-color: #787878;
-  border: 1px solid #32414B;
-  min-height: 8px;
-  border-radius: 4px;
-}
-
-QScrollBar::handle:vertical:hover {
-  background-color: #148CD2;
-  border: 1px solid #148CD2;
-  border-radius: 4px;
-  min-height: 8px;
-}
-
-QScrollBar::handle:vertical:focus {
-  border: 1px solid #1464A0;
-}
-
-QScrollBar::add-line:horizontal {
-  margin: 0px 0px 0px 0px;
-  border-image: url(":/qss_icons/rc/arrow_right_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: right;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
-  border-image: url(":/qss_icons/rc/arrow_right.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: right;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:vertical {
-  margin: 3px 0px 3px 0px;
-  border-image: url(":/qss_icons/rc/arrow_down_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: bottom;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
-  border-image: url(":/qss_icons/rc/arrow_down.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: bottom;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:horizontal {
-  margin: 0px 3px 0px 3px;
-  border-image: url(":/qss_icons/rc/arrow_left_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: left;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
-  border-image: url(":/qss_icons/rc/arrow_left.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: left;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:vertical {
-  margin: 3px 0px 3px 0px;
-  border-image: url(":/qss_icons/rc/arrow_up_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: top;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
-  border-image: url(":/qss_icons/rc/arrow_up.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: top;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
-}
-
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
-}
-
-/* QTextEdit --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
-
---------------------------------------------------------------------------- */
-QTextEdit {
-  background-color: #19232D;
-  color: #F0F0F0;
-  border-radius: 4px;
-  border: 1px solid #32414B;
-}
-
-QTextEdit:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QTextEdit:focus {
-  border: 1px solid #1464A0;
-}
-
-QTextEdit:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-/* QPlainTextEdit ---------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QPlainTextEdit {
-  background-color: #19232D;
-  color: #F0F0F0;
-  border-radius: 4px;
-  border: 1px solid #32414B;
-}
-
-QPlainTextEdit:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QPlainTextEdit:focus {
-  border: 1px solid #1464A0;
-}
-
-QPlainTextEdit:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-/* QSizeGrip --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
-
---------------------------------------------------------------------------- */
-QSizeGrip {
-  background: transparent;
-  width: 12px;
-  height: 12px;
-  image: url(":/qss_icons/rc/window_grip.png");
-}
-
-/* QStackedWidget ---------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QStackedWidget {
-  padding: 2px;
-  border: 1px solid #32414B;
-  border: 1px solid #19232D;
-}
-
-/* QToolBar ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
-
---------------------------------------------------------------------------- */
-QToolBar {
-  background-color: #32414B;
-  border-bottom: 1px solid #19232D;
-  padding: 2px;
-  font-weight: bold;
-  spacing: 2px;
-}
-
-QToolBar QToolButton {
-  background-color: #32414B;
-  border: 1px solid #32414B;
-}
-
-QToolBar QToolButton:hover {
-  border: 1px solid #148CD2;
-}
-
-QToolBar QToolButton:checked {
-  border: 1px solid #19232D;
-  background-color: #19232D;
-}
-
-QToolBar QToolButton:checked:hover {
-  border: 1px solid #148CD2;
-}
-
-QToolBar::handle:horizontal {
-  width: 16px;
-  image: url(":/qss_icons/rc/toolbar_move_horizontal.png");
-}
-
-QToolBar::handle:vertical {
-  height: 16px;
-  image: url(":/qss_icons/rc/toolbar_move_vertical.png");
-}
-
-QToolBar::separator:horizontal {
-  width: 16px;
-  image: url(":/qss_icons/rc/toolbar_separator_horizontal.png");
-}
-
-QToolBar::separator:vertical {
-  height: 16px;
-  image: url(":/qss_icons/rc/toolbar_separator_vertical.png");
-}
-
-QToolButton#qt_toolbar_ext_button {
-  background: #32414B;
-  border: 0px;
-  color: #F0F0F0;
-  image: url(":/qss_icons/rc/arrow_right.png");
-}
-
-/* QAbstractSpinBox -------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QAbstractSpinBox {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  /* This fixes 103, 111 */
-  padding-top: 2px;
-  /* This fixes 103, 111 */
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  border-radius: 4px;
-  /* min-width: 5px; removed to fix 109 */
-}
-
-QAbstractSpinBox:up-button {
-  background-color: transparent #19232D;
-  subcontrol-origin: border;
-  subcontrol-position: top right;
-  border-left: 1px solid #32414B;
-  border-bottom: 1px solid #32414B;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  margin: 1px;
-  width: 12px;
-  margin-bottom: -1px;
-}
-
-QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(":/qss_icons/rc/arrow_up_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QAbstractSpinBox::up-arrow:hover {
-  image: url(":/qss_icons/rc/arrow_up.png");
-}
-
-QAbstractSpinBox:down-button {
-  background-color: transparent #19232D;
-  subcontrol-origin: border;
-  subcontrol-position: bottom right;
-  border-left: 1px solid #32414B;
-  border-top: 1px solid #32414B;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  margin: 1px;
-  width: 12px;
-  margin-top: -1px;
-}
-
-QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(":/qss_icons/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QAbstractSpinBox::down-arrow:hover {
-  image: url(":/qss_icons/rc/arrow_down.png");
-}
-
-QAbstractSpinBox:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QAbstractSpinBox:focus {
-  border: 1px solid #1464A0;
-}
-
-QAbstractSpinBox:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-/* ------------------------------------------------------------------------ */
-/* DISPLAYS --------------------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QLabel -----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
-
---------------------------------------------------------------------------- */
-QLabel {
-  background-color: #19232D;
-  border: 0px solid #32414B;
-  padding: 2px;
-  margin: 0px;
-  color: #F0F0F0;
-}
-
-QLabel:disabled {
-  background-color: #19232D;
-  border: 0px solid #32414B;
-  color: #787878;
-}
-
-/* QTextBrowser -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
-
---------------------------------------------------------------------------- */
-QTextBrowser {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-radius: 4px;
-}
-
-QTextBrowser:disabled {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #787878;
-  border-radius: 4px;
-}
-
-QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
-  border: 1px solid #32414B;
-}
-
-/* QGraphicsView ----------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QGraphicsView {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-radius: 4px;
-}
-
-QGraphicsView:disabled {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #787878;
-  border-radius: 4px;
-}
-
-QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView:pressed {
-  border: 1px solid #32414B;
-}
-
-/* QCalendarWidget --------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QCalendarWidget {
-  border: 1px solid #32414B;
-  border-radius: 4px;
-}
-
-QCalendarWidget:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-/* QLCDNumber -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QLCDNumber {
-  background-color: #19232D;
-  color: #F0F0F0;
-}
-
-QLCDNumber:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-/* QProgressBar -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar
-
---------------------------------------------------------------------------- */
-QProgressBar {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-radius: 4px;
-  text-align: center;
-}
-
-QProgressBar:disabled {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #787878;
-  border-radius: 4px;
-  text-align: center;
-}
-
-QProgressBar::chunk {
-  background-color: #1464A0;
-  color: #19232D;
-  border-radius: 4px;
-}
-
-QProgressBar::chunk:disabled {
-  background-color: #14506E;
-  color: #787878;
-  border-radius: 4px;
-}
-
-/* ------------------------------------------------------------------------ */
-/* BUTTONS ---------------------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QPushButton ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
-
---------------------------------------------------------------------------- */
-QPushButton {
-  background-color: #505F69;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-radius: 4px;
-  padding: 3px;
-  outline: none;
-  /* Issue #194 - Special case of QPushButton inside dialogs, for better UI */
-  min-width: 80px;
-}
-
-QPushButton:disabled {
-  background-color: #32414B;
-  border: 1px solid #32414B;
-  color: #787878;
-  border-radius: 4px;
-  padding: 3px;
-}
-
-QPushButton:checked {
-  background-color: #32414B;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  padding: 3px;
-  outline: none;
-}
-
-QPushButton:checked:disabled {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #787878;
-  border-radius: 4px;
-  padding: 3px;
-  outline: none;
-}
-
-QPushButton:checked:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-QPushButton::menu-indicator {
-  subcontrol-origin: padding;
-  subcontrol-position: bottom right;
-  bottom: 4px;
-}
-
-QPushButton:pressed {
-  background-color: #19232D;
-  border: 1px solid #19232D;
-}
-
-QPushButton:pressed:hover {
-  border: 1px solid #148CD2;
-}
-
-QPushButton:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QPushButton:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-QPushButton:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QPushButton:focus {
-  border: 1px solid #1464A0;
-}
-
-/* QToolButton ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
-
---------------------------------------------------------------------------- */
-QToolButton {
-  background-color: transparent;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  margin: 0px;
-  padding: 2px;
-  /* The subcontrols below are used only in the DelayedPopup mode */
-  /* The subcontrols below are used only in the MenuButtonPopup mode */
-  /* The subcontrol below is used only in the InstantPopup or DelayedPopup mode */
-}
-
-QToolButton:checked {
-  background-color: transparent;
-  border: 1px solid #1464A0;
-}
-
-QToolButton:checked:disabled {
-  border: 1px solid #14506E;
-}
-
-QToolButton:pressed {
-  margin: 1px;
-  background-color: transparent;
-  border: 1px solid #1464A0;
-}
-
-QToolButton:disabled {
-  border: none;
-}
-
-QToolButton:hover {
-  border: 1px solid #148CD2;
-}
-
-QToolButton[popupMode="0"] {
-  /* Only for DelayedPopup */
-  padding-right: 2px;
-}
-
-QToolButton[popupMode="1"] {
-  /* Only for MenuButtonPopup */
-  padding-right: 20px;
-}
-
-QToolButton[popupMode="1"]::menu-button {
-  border: none;
-}
-
-QToolButton[popupMode="1"]::menu-button:hover {
-  border: none;
-  border-left: 1px solid #148CD2;
-  border-radius: 0;
-}
-
-QToolButton[popupMode="2"] {
-  /* Only for InstantPopup */
-  padding-right: 2px;
-}
-
-QToolButton::menu-button {
-  padding: 2px;
-  border-radius: 4px;
-  border: 1px solid #32414B;
-  width: 12px;
-  outline: none;
-}
-
-QToolButton::menu-button:hover {
-  border: 1px solid #148CD2;
-}
-
-QToolButton::menu-button:checked:hover {
-  border: 1px solid #148CD2;
-}
-
-QToolButton::menu-indicator {
-  image: url(":/qss_icons/rc/arrow_down.png");
-  height: 8px;
-  width: 8px;
-  top: 0;
-  /* Exclude a shift for better image */
-  left: -2px;
-  /* Shift it a bit */
-}
-
-QToolButton::menu-arrow {
-  image: url(":/qss_icons/rc/arrow_down.png");
-  height: 8px;
-  width: 8px;
-}
-
-QToolButton::menu-arrow:hover {
-  image: url(":/qss_icons/rc/arrow_down_focus.png");
-}
-
-/* QCommandLinkButton -----------------------------------------------------
-
---------------------------------------------------------------------------- */
-QCommandLinkButton {
-  background-color: transparent;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-radius: 4px;
-  padding: 0px;
-  margin: 0px;
-}
-
-QCommandLinkButton:disabled {
-  background-color: transparent;
-  color: #787878;
-}
-
-/* ------------------------------------------------------------------------ */
-/* INPUTS - NO FIELDS ----------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QComboBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
-
---------------------------------------------------------------------------- */
-QComboBox {
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  selection-background-color: #1464A0;
-  padding-left: 4px;
-  padding-right: 36px;
-  /* 4 + 16*2 See scrollbar size */
-  /* Fixes #103, #111 */
-  min-height: 1.5em;
-  /* padding-top: 2px;     removed to fix #132 */
-  /* padding-bottom: 2px;  removed to fix #132 */
-  /* min-width: 75px;      removed to fix #109 */
-  /* Needed to remove indicator - fix #132 */
-}
-
-QComboBox QAbstractItemView {
-  border: 1px solid #32414B;
-  border-radius: 0;
-  background-color: #19232D;
-  selection-background-color: #1464A0;
-}
-
-QComboBox QAbstractItemView:hover {
-  background-color: #19232D;
-  color: #F0F0F0;
-}
-
-QComboBox QAbstractItemView:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-QComboBox QAbstractItemView:alternate {
-  background: #19232D;
-}
-
-QComboBox:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-QComboBox:hover {
-  border: 1px solid #148CD2;
-}
-
-QComboBox:focus {
-  border: 1px solid #1464A0;
-}
-
-QComboBox:on {
-  selection-background-color: #1464A0;
-}
-
-QComboBox::indicator {
-  border: none;
-  border-radius: 0;
-  background-color: transparent;
-  selection-background-color: transparent;
-  color: transparent;
-  selection-color: transparent;
-  /* Needed to remove indicator - fix #132 */
-}
-
-QComboBox::indicator:alternate {
-  background: #19232D;
-}
-
-QComboBox::item:alternate {
-  background: #19232D;
-}
-
-QComboBox::item:checked {
-  font-weight: bold;
-}
-
-QComboBox::item:selected {
-  border: 0px solid transparent;
-}
-
-QComboBox::drop-down {
-  subcontrol-origin: padding;
-  subcontrol-position: top right;
-  width: 12px;
-  border-left: 1px solid #32414B;
-}
-
-QComboBox::down-arrow {
-  image: url(":/qss_icons/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
-  image: url(":/qss_icons/rc/arrow_down.png");
-}
-
-/* QSlider ----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
-
---------------------------------------------------------------------------- */
-QSlider:disabled {
-  background: #19232D;
-}
-
-QSlider:focus {
-  border: none;
-}
-
-QSlider::groove:horizontal {
-  background: #32414B;
-  border: 1px solid #32414B;
-  height: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::groove:vertical {
-  background: #32414B;
-  border: 1px solid #32414B;
-  width: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::add-page:vertical {
-  background: #1464A0;
-  border: 1px solid #32414B;
-  width: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::add-page:vertical :disabled {
-  background: #14506E;
-}
-
-QSlider::sub-page:horizontal {
-  background: #1464A0;
-  border: 1px solid #32414B;
-  height: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::sub-page:horizontal:disabled {
-  background: #14506E;
-}
-
-QSlider::handle:horizontal {
-  background: #787878;
-  border: 1px solid #32414B;
-  width: 8px;
-  height: 8px;
-  margin: -8px 0px;
-  border-radius: 4px;
-}
-
-QSlider::handle:horizontal:hover {
-  background: #148CD2;
-  border: 1px solid #148CD2;
-}
-
-QSlider::handle:horizontal:focus {
-  border: 1px solid #1464A0;
-}
-
-QSlider::handle:vertical {
-  background: #787878;
-  border: 1px solid #32414B;
-  width: 8px;
-  height: 8px;
-  margin: 0 -8px;
-  border-radius: 4px;
-}
-
-QSlider::handle:vertical:hover {
-  background: #148CD2;
-  border: 1px solid #148CD2;
-}
-
-QSlider::handle:vertical:focus {
-  border: 1px solid #1464A0;
-}
-
-/* QLineEdit --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlineedit
-
---------------------------------------------------------------------------- */
-QLineEdit {
-  background-color: #19232D;
-  padding-top: 2px;
-  /* This QLineEdit fix  103, 111 */
-  padding-bottom: 2px;
-  /* This QLineEdit fix  103, 111 */
-  padding-left: 4px;
-  padding-right: 4px;
-  border-style: solid;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  color: #F0F0F0;
-}
-
-QLineEdit:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-QLineEdit:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QLineEdit:focus {
-  border: 1px solid #1464A0;
-}
-
-QLineEdit:selected {
-  background-color: #1464A0;
-  color: #32414B;
-}
-
-/* QTabWiget --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
-
---------------------------------------------------------------------------- */
-QTabWidget {
-  padding: 2px;
-  selection-background-color: #32414B;
-}
-
-QTabWidget QWidget {
-  /* Fixes #189 */
-  border-radius: 4px;
-}
-
-QTabWidget::pane {
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  margin: 0px;
-  /* Fixes double border inside pane with pyqt5 */
-  padding: 0px;
-}
-
-QTabWidget::pane:selected {
-  background-color: #32414B;
-  border: 1px solid #1464A0;
-}
-
-/* QTabBar ----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
-
---------------------------------------------------------------------------- */
-QTabBar {
-  qproperty-drawBase: 0;
-  border-radius: 4px;
-  margin: 0px;
-  padding: 2px;
-  border: 0;
-  /* left: 5px; move to the right by 5px - removed for fix */
-}
-
-QTabBar::close-button {
-  border: 0;
-  margin: 2px;
-  padding: 2px;
-  image: url(":/qss_icons/rc/window_close.png");
-}
-
-QTabBar::close-button:hover {
-  image: url(":/qss_icons/rc/window_close_focus.png");
-}
-
-QTabBar::close-button:pressed {
-  image: url(":/qss_icons/rc/window_close_pressed.png");
-}
-
-/* QTabBar::tab - selected ------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
-
---------------------------------------------------------------------------- */
-QTabBar::tab {
-  /* !selected and disabled ----------------------------------------- */
-  /* selected ------------------------------------------------------- */
-}
-
-QTabBar::tab:top:selected:disabled {
-  border-bottom: 3px solid #14506E;
-  color: #787878;
-  background-color: #32414B;
-}
-
-QTabBar::tab:bottom:selected:disabled {
-  border-top: 3px solid #14506E;
-  color: #787878;
-  background-color: #32414B;
-}
-
-QTabBar::tab:left:selected:disabled {
-  border-right: 3px solid #14506E;
-  color: #787878;
-  background-color: #32414B;
-}
-
-QTabBar::tab:right:selected:disabled {
-  border-left: 3px solid #14506E;
-  color: #787878;
-  background-color: #32414B;
-}
-
-QTabBar::tab:top:!selected:disabled {
-  border-bottom: 3px solid #19232D;
-  color: #787878;
-  background-color: #19232D;
-}
-
-QTabBar::tab:bottom:!selected:disabled {
-  border-top: 3px solid #19232D;
-  color: #787878;
-  background-color: #19232D;
-}
-
-QTabBar::tab:left:!selected:disabled {
-  border-right: 3px solid #19232D;
-  color: #787878;
-  background-color: #19232D;
-}
-
-QTabBar::tab:right:!selected:disabled {
-  border-left: 3px solid #19232D;
-  color: #787878;
-  background-color: #19232D;
-}
-
-QTabBar::tab:top:!selected {
-  border-bottom: 2px solid #19232D;
-  margin-top: 2px;
-}
-
-QTabBar::tab:bottom:!selected {
-  border-top: 2px solid #19232D;
-  margin-bottom: 3px;
-}
-
-QTabBar::tab:left:!selected {
-  border-left: 2px solid #19232D;
-  margin-right: 2px;
-}
-
-QTabBar::tab:right:!selected {
-  border-right: 2px solid #19232D;
-  margin-left: 2px;
-}
-
-QTabBar::tab:top {
-  background-color: #32414B;
-  color: #F0F0F0;
-  margin-left: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  min-width: 5px;
-  border-bottom: 3px solid #32414B;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-
-QTabBar::tab:top:selected {
-  background-color: #505F69;
-  color: #F0F0F0;
-  border-bottom: 3px solid #1464A0;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
-}
-
-QTabBar::tab:top:!selected:hover {
-  border: 1px solid #148CD2;
-  border-bottom: 3px solid #148CD2;
-  /* Fixes spyder-ide/spyder#9766 */
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-QTabBar::tab:bottom {
-  color: #F0F0F0;
-  border-top: 3px solid #32414B;
-  background-color: #32414B;
-  margin-left: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-  min-width: 5px;
-}
-
-QTabBar::tab:bottom:selected {
-  color: #F0F0F0;
-  background-color: #505F69;
-  border-top: 3px solid #1464A0;
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-}
-
-QTabBar::tab:bottom:!selected:hover {
-  border: 1px solid #148CD2;
-  border-top: 3px solid #148CD2;
-  /* Fixes spyder-ide/spyder#9766 */
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-QTabBar::tab:left {
-  color: #F0F0F0;
-  background-color: #32414B;
-  margin-top: 2px;
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
-  min-height: 5px;
-}
-
-QTabBar::tab:left:selected {
-  color: #F0F0F0;
-  background-color: #505F69;
-  border-right: 3px solid #1464A0;
-}
-
-QTabBar::tab:left:!selected:hover {
-  border: 1px solid #148CD2;
-  border-right: 3px solid #148CD2;
-  padding: 0px;
-}
-
-QTabBar::tab:right {
-  color: #F0F0F0;
-  background-color: #32414B;
-  margin-top: 2px;
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
-  min-height: 5px;
-}
-
-QTabBar::tab:right:selected {
-  color: #F0F0F0;
-  background-color: #505F69;
-  border-left: 3px solid #1464A0;
-}
-
-QTabBar::tab:right:!selected:hover {
-  border: 1px solid #148CD2;
-  border-left: 3px solid #148CD2;
-  padding: 0px;
-}
-
-QTabBar QToolButton {
-  /* Fixes #136 */
-  background-color: #32414B;
-  height: 12px;
-  width: 12px;
-}
-
-QTabBar QToolButton:pressed {
-  background-color: #32414B;
-}
-
-QTabBar QToolButton:pressed:hover {
-  border: 1px solid #148CD2;
-}
-
-QTabBar QToolButton::left-arrow:enabled {
-  image: url(":/qss_icons/rc/arrow_left.png");
-}
-
-QTabBar QToolButton::left-arrow:disabled {
-  image: url(":/qss_icons/rc/arrow_left_disabled.png");
-}
-
-QTabBar QToolButton::right-arrow:enabled {
-  image: url(":/qss_icons/rc/arrow_right.png");
-}
-
-QTabBar QToolButton::right-arrow:disabled {
-  image: url(":/qss_icons/rc/arrow_right_disabled.png");
-}
-
-/* QDockWiget -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QDockWidget {
-  outline: 1px solid #32414B;
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  titlebar-close-icon: url(":/qss_icons/rc/window_close.png");
-  titlebar-normal-icon: url(":/qss_icons/rc/window_undock.png");
-}
-
-QDockWidget::title {
-  /* Better size for title bar */
-  padding: 6px;
-  spacing: 4px;
-  border: none;
-  background-color: #32414B;
-}
-
-QDockWidget::close-button {
-  background-color: #32414B;
-  border-radius: 4px;
-  border: none;
-}
-
-QDockWidget::close-button:hover {
-  image: url(":/qss_icons/rc/window_close_focus.png");
-}
-
-QDockWidget::close-button:pressed {
-  image: url(":/qss_icons/rc/window_close_pressed.png");
-}
-
-QDockWidget::float-button {
-  background-color: #32414B;
-  border-radius: 4px;
-  border: none;
-}
-
-QDockWidget::float-button:hover {
-  image: url(":/qss_icons/rc/window_undock_focus.png");
-}
-
-QDockWidget::float-button:pressed {
-  image: url(":/qss_icons/rc/window_undock_pressed.png");
-}
-
-/* QTreeView QListView QTableView -----------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
-
---------------------------------------------------------------------------- */
-QTreeView:branch:selected, QTreeView:branch:hover {
-  background: url(":/qss_icons/rc/transparent.png");
-}
-
-QTreeView:branch:has-siblings:!adjoins-item {
-  border-image: url(":/qss_icons/rc/branch_line.png") 0;
-}
-
-QTreeView:branch:has-siblings:adjoins-item {
-  border-image: url(":/qss_icons/rc/branch_more.png") 0;
-}
-
-QTreeView:branch:!has-children:!has-siblings:adjoins-item {
-  border-image: url(":/qss_icons/rc/branch_end.png") 0;
-}
-
-QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
-  border-image: none;
-  image: url(":/qss_icons/rc/branch_closed.png");
-}
-
-QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
-  border-image: none;
-  image: url(":/qss_icons/rc/branch_open.png");
-}
-
-QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
-  image: url(":/qss_icons/rc/branch_closed_focus.png");
-}
-
-QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
-  image: url(":/qss_icons/rc/branch_open_focus.png");
-}
-
-QTreeView::indicator:checked,
-QListView::indicator:checked {
-  image: url(":/qss_icons/rc/checkbox_checked.png");
-}
-
-QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
-QListView::indicator:checked:hover,
-QListView::indicator:checked:focus,
-QListView::indicator:checked:pressed {
-  image: url(":/qss_icons/rc/checkbox_checked_focus.png");
-}
-
-QTreeView::indicator:unchecked,
-QListView::indicator:unchecked {
-  image: url(":/qss_icons/rc/checkbox_unchecked.png");
-}
-
-QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
-QListView::indicator:unchecked:hover,
-QListView::indicator:unchecked:focus,
-QListView::indicator:unchecked:pressed {
-  image: url(":/qss_icons/rc/checkbox_unchecked_focus.png");
-}
-
-QTreeView::indicator:indeterminate,
-QListView::indicator:indeterminate {
-  image: url(":/qss_icons/rc/checkbox_indeterminate.png");
-}
-
-QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
-QListView::indicator:indeterminate:hover,
-QListView::indicator:indeterminate:focus,
-QListView::indicator:indeterminate:pressed {
-  image: url(":/qss_icons/rc/checkbox_indeterminate_focus.png");
-}
-
-QTreeView,
-QListView,
-QTableView,
-QColumnView {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  gridline-color: #32414B;
-  border-radius: 4px;
-}
-
-QTreeView:disabled,
-QListView:disabled,
-QTableView:disabled,
-QColumnView:disabled {
-  background-color: #19232D;
-  color: #787878;
-}
-
-QTreeView:selected,
-QListView:selected,
-QTableView:selected,
-QColumnView:selected {
-  background-color: #1464A0;
-  color: #32414B;
-}
-
-QTreeView:hover,
-QListView:hover,
-QTableView:hover,
-QColumnView:hover {
-  background-color: #19232D;
-  border: 1px solid #148CD2;
-}
-
-QTreeView::item:pressed,
-QListView::item:pressed,
-QTableView::item:pressed,
-QColumnView::item:pressed {
-  background-color: #1464A0;
-}
-
-QTreeView::item:selected:hover,
-QListView::item:selected:hover,
-QTableView::item:selected:hover,
-QColumnView::item:selected:hover {
-  background: #1464A0;
-  color: #19232D;
-}
-
-QTreeView::item:selected:active,
-QListView::item:selected:active,
-QTableView::item:selected:active,
-QColumnView::item:selected:active {
-  background-color: #1464A0;
-}
-
-QTreeView::item:!selected:hover,
-QListView::item:!selected:hover,
-QTableView::item:!selected:hover,
-QColumnView::item:!selected:hover {
-  outline: 0;
-  color: #148CD2;
-  background-color: #32414B;
-}
-
-QTableCornerButton::section {
-  background-color: #19232D;
-  border: 1px transparent #32414B;
-  border-radius: 0px;
-}
-
-/* QHeaderView ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
-
---------------------------------------------------------------------------- */
-QHeaderView {
-  background-color: #32414B;
-  border: 0px transparent #32414B;
-  padding: 0px;
-  margin: 0px;
-  border-radius: 0px;
-}
-
-QHeaderView:disabled {
-  background-color: #32414B;
-  border: 1px transparent #32414B;
-  padding: 2px;
-}
-
-QHeaderView::section {
-  background-color: #32414B;
-  color: #F0F0F0;
-  padding: 2px;
-  border-radius: 0px;
-  text-align: left;
-}
-
-QHeaderView::section:checked {
-  color: #F0F0F0;
-  background-color: #1464A0;
-}
-
-QHeaderView::section:checked:disabled {
-  color: #787878;
-  background-color: #14506E;
-}
-
-QHeaderView::section::horizontal {
-  padding-left: 4px;
-  padding-right: 4px;
-  border-left: 1px solid #19232D;
-}
-
-QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
-  border-left: 1px solid #32414B;
-}
-
-QHeaderView::section::horizontal:disabled {
-  color: #787878;
-}
-
-QHeaderView::section::vertical {
-  padding-left: 4px;
-  padding-right: 4px;
-  border-top: 1px solid #19232D;
-}
-
-QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
-  border-top: 1px solid #32414B;
-}
-
-QHeaderView::section::vertical:disabled {
-  color: #787878;
-}
-
-QHeaderView::down-arrow {
-  /* Those settings (border/width/height/background-color) solve bug */
-  /* transparent arrow background and size */
-  background-color: #32414B;
-  border: none;
-  height: 12px;
-  width: 12px;
-  padding-left: 2px;
-  padding-right: 2px;
-  image: url(":/qss_icons/rc/arrow_down.png");
-}
-
-QHeaderView::up-arrow {
-  background-color: #32414B;
-  border: none;
-  height: 12px;
-  width: 12px;
-  padding-left: 2px;
-  padding-right: 2px;
-  image: url(":/qss_icons/rc/arrow_up.png");
-}
-
-/* QToolBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbox
-
---------------------------------------------------------------------------- */
-QToolBox {
-  padding: 0px;
-  border: 0px;
-  border: 1px solid #32414B;
-}
-
-QToolBox:selected {
-  padding: 0px;
-  border: 2px solid #1464A0;
-}
-
-QToolBox::tab {
-  background-color: #19232D;
-  border: 1px solid #32414B;
-  color: #F0F0F0;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
-QToolBox::tab:disabled {
-  color: #787878;
-}
-
-QToolBox::tab:selected {
-  background-color: #505F69;
-  border-bottom: 2px solid #1464A0;
-}
-
-QToolBox::tab:selected:disabled {
-  background-color: #32414B;
-  border-bottom: 2px solid #14506E;
-}
-
-QToolBox::tab:!selected {
-  background-color: #32414B;
-  border-bottom: 2px solid #32414B;
-}
-
-QToolBox::tab:!selected:disabled {
-  background-color: #19232D;
-}
-
-QToolBox::tab:hover {
-  border-color: #148CD2;
-  border-bottom: 2px solid #148CD2;
-}
-
-QToolBox QScrollArea QWidget QWidget {
-  padding: 0px;
-  border: 0px;
-  background-color: #19232D;
-}
-
-/* QFrame -----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
-https://doc.qt.io/qt-5/qframe.html#-prop
-https://doc.qt.io/qt-5/qframe.html#details
-https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
-
---------------------------------------------------------------------------- */
-/* (dot) .QFrame  fix #141, #126, #123 */
-.QFrame {
-  border-radius: 4px;
-  border: 1px solid #32414B;
-  /* No frame */
-  /* HLine */
-  /* HLine */
-}
-
-.QFrame[frameShape="0"] {
-  border-radius: 4px;
-  border: 1px transparent #32414B;
-}
-
-.QFrame[frameShape="4"] {
-  max-height: 2px;
-  border: none;
-  background-color: #32414B;
-}
-
-.QFrame[frameShape="5"] {
-  max-width: 2px;
-  border: none;
-  background-color: #32414B;
-}
-
-/* QSplitter --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
-
---------------------------------------------------------------------------- */
-QSplitter {
-  background-color: #32414B;
-  spacing: 0px;
-  padding: 0px;
-  margin: 0px;
-}
-
-QSplitter::handle {
-  background-color: #32414B;
-  border: 0px solid #19232D;
-  spacing: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-
-QSplitter::handle:hover {
-  background-color: #787878;
-}
-
-QSplitter::handle:horizontal {
-  width: 5px;
-  image: url(":/qss_icons/rc/line_vertical.png");
-}
-
-QSplitter::handle:vertical {
-  height: 5px;
-  image: url(":/qss_icons/rc/line_horizontal.png");
-}
-
-/* QDateEdit --------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QDateEdit {
-  selection-background-color: #1464A0;
-  border-style: solid;
-  border: 1px solid #32414B;
-  border-radius: 4px;
-  /* This fixes 103, 111 */
-  padding-top: 2px;
-  /* This fixes 103, 111 */
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  min-width: 10px;
-}
-
-QDateEdit:on {
-  selection-background-color: #1464A0;
-}
-
-QDateEdit::drop-down {
-  subcontrol-origin: padding;
-  subcontrol-position: top right;
-  width: 12px;
-  border-left: 1px solid #32414B;
-}
-
-QDateEdit::down-arrow {
-  image: url(":/qss_icons/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus {
-  image: url(":/qss_icons/rc/arrow_down.png");
-}
-
-QDateEdit QAbstractItemView {
-  background-color: #19232D;
-  border-radius: 4px;
-  border: 1px solid #32414B;
-  selection-background-color: #1464A0;
-}
-
-/* QAbstractView ----------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QAbstractView:hover {
-  border: 1px solid #148CD2;
-  color: #F0F0F0;
-}
-
-QAbstractView:selected {
-  background: #1464A0;
-  color: #32414B;
-}
-
-/* PlotWidget -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-PlotWidget {
-  /* Fix cut labels in plots #134 */
-  padding: 0px;
-}
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
index 86e4b68488..6a3340788b 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py
@@ -384,8 +384,7 @@ def stash_env(_SYNTH_ENV_DICT = OrderedDict()):
     # changed to just make the fallback what is set in boostrap
     # so now it's less of a fallnack and more correct if not
     # explicitly set
-    _LY_PROJECT = os.getenv(ENVAR_LY_PROJECT,
-                            get_current_project(_LY_DEV))
+    _LY_PROJECT = os.getenv(ENVAR_LY_PROJECT)
     _SYNTH_ENV_DICT[ENVAR_LY_PROJECT] = _LY_PROJECT
     
     _LY_BUILD_DIR_NAME = os.getenv(ENVAR_LY_BUILD_DIR_NAME,
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
index c62571b2f5..0fa0b6ee67 100755
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py
@@ -109,11 +109,11 @@ def init_ly_pyside(LY_DEV=None):
                                     'bin',
                                     'profile').resolve()
 
-    # allows to retreive from settings.QTFORPYTHON_PATH
-    from azpy.constants import STR_QTFORPYTHON_PATH  # a path string constructor
-    QTFORPYTHON_PATH = Path(STR_QTFORPYTHON_PATH.format(LY_DEV)).resolve()
-    os.environ["DYNACONF_QTFORPYTHON_PATH"] = str(QTFORPYTHON_PATH)
-    site.addsitedir(str(QTFORPYTHON_PATH))  # PYTHONPATH
+    # # allows to retreive from settings.QTFORPYTHON_PATH
+    # from azpy.constants import STR_QTFORPYTHON_PATH  # a path string constructor
+    # QTFORPYTHON_PATH = Path(STR_QTFORPYTHON_PATH.format(LY_DEV)).resolve()
+    # os.environ["DYNACONF_QTFORPYTHON_PATH"] = str(QTFORPYTHON_PATH)
+    # site.addsitedir(str(QTFORPYTHON_PATH))  # PYTHONPATH
 
     QT_PLUGIN_PATH = Path.joinpath(LY_BIN_PATH,
                                    'EditorPlugins').resolve()
@@ -131,15 +131,15 @@ def init_ly_pyside(LY_DEV=None):
 
     # add Qt binaries to the Windows path to handle findings DLL file dependencies
     if sys.platform.startswith('win'):
-        path = os.environ['PATH']
-        newPath = ''
-        newPath += str(LY_BIN_PATH) + os.pathsep
-        newPath += str(Path.joinpath(QTFORPYTHON_PATH,
-                                     'shiboken2').resolve()) + os.pathsep
-        newPath += str(Path.joinpath(QTFORPYTHON_PATH,
-                                     'PySide2').resolve()) + os.pathsep
-        newPath += path
-        os.environ['PATH']=newPath
+        # path = os.environ['PATH']
+        # newPath = ''
+        # newPath += str(LY_BIN_PATH) + os.pathsep
+        # newPath += str(Path.joinpath(QTFORPYTHON_PATH,
+        #                              'shiboken2').resolve()) + os.pathsep
+        # newPath += str(Path.joinpath(QTFORPYTHON_PATH,
+        #                              'PySide2').resolve()) + os.pathsep
+        # newPath += path
+        # os.environ['PATH']=newPath
         _LOGGER.debug('PySide2 bootstrapped PATH for Windows.')
 
     try:
@@ -223,8 +223,8 @@ os.environ["DYNACONF_DCCSI_DEV_MODE"] = str(_DCCSI_DEV_MODE)
 _LY_DEV = azpy.config_utils.get_stub_check_path(in_path=_DCCSIG_PATH,
                                                 check_stub='engine.json')
 os.environ["DYNACONF_LY_DEV"] = str(_LY_DEV.resolve())
-_LY_PROJECT = azpy.config_utils.get_current_project(_LY_DEV)
-os.environ["DYNACONF_LY_PROJECT"] = _LY_PROJECT
+_LY_PROJECT = azpy.config_utils.get_current_project()
+os.environ["DYNACONF_LY_PROJECT"] = str(_LY_PROJECT.resolve())
 _LY_PROJECT_PATH = Path(_LY_DEV, _LY_PROJECT)
 os.environ["DYNACONF_LY_PROJECT_PATH"] = str(_LY_PROJECT_PATH)
 os.environ["DYNACONF_DCCSIG_PATH"] = str(_DCCSIG_PATH)
@@ -319,7 +319,7 @@ if __name__ == '__main__':
 
     settings.setenv()  # doing this will add/set the additional DYNACONF_ envars
 
-    _LOGGER.info('QTFORPYTHON_PATH: {}'.format(settings.QTFORPYTHON_PATH))
+    #_LOGGER.info('QTFORPYTHON_PATH: {}'.format(settings.QTFORPYTHON_PATH))
     _LOGGER.info('LY_BIN_PATH: {}'.format(settings.LY_BIN_PATH))
     _LOGGER.info('QT_PLUGIN_PATH: {}'.format(settings.QT_PLUGIN_PATH))
     _LOGGER.info('QT_QPA_PLATFORM_PLUGIN_PATH: {}'.format(settings.QT_QPA_PLATFORM_PLUGIN_PATH))
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
new file mode 100644
index 0000000000..ca80c62dd0
--- /dev/null
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
@@ -0,0 +1,17 @@
+{
+    "gem_name": "Atom_DccScriptingInterface",
+    "GemFormatVersion": 4,
+    "Uuid": "7bf5a77dacd8438bb4966a66b5a678d8",
+    "Name": "Atom_DccScriptingInterface",
+    "DisplayName": "Atom DccScriptingInterface (DCCsi)",
+    "Version": "0.1.0",
+    "Summary": "A python framework for working with various DCC tools and workflows.",
+    "Tags": ["DCC","Digital","Content","Creation"],
+    "IconPath": "preview.png",
+    "Modules": [
+        {
+            "Name": "Editor",
+            "Type": "EditorModule"
+        }
+    ]
+}
diff --git a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
index 2f7626addb..1536b79f3d 100644
--- a/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
+++ b/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/requirements.txt
@@ -36,6 +36,16 @@ unipath==1.1 \
     --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
     --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
     # via -r requirements.txt
+qdarkstyle==3.0.2 \
+    --hash=sha256:55d149cf5f40ee297397f1818e091118cefb855a4a9c5c38566c47acd2d8c7ae \
+    --hash=sha256:7c791535cc20b3cc1e8e1bf6b88dabe53cb0615983df702be83597e73ada2558
+    # via -r c:\temp\requirements.txt
+qtpy==1.9.0 \
+    --hash=sha256:2db72c44b55d0fe1407be8fba35c838ad0d6d3bb81f23007886dc1fc0f459c8d \
+    --hash=sha256:fa0b8363b363e89b2a6f49eddc162a04c0699ae95e109a6be3bb145a913190ea
+    # via
+    #   -r c:\temp\requirements.txt
+    #   qdarkstyle
 wincertstore==0.2 \
     --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
     --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a
diff --git a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
index f7b54a44d9..b08aa6fa1d 100644
--- a/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
+++ b/Gems/AudioEngineWwise/Code/Source/Builder/AudioControlBuilderWorker.cpp
@@ -57,11 +57,11 @@ namespace AudioControlBuilder
                     {
                         atlPlatform = "windows";
                     }
-                    else if (platform == "es3")
+                    else if (platform == "android")
                     {
                         atlPlatform = "android";
                     }
-                    else if (platform == "osx_gl")
+                    else if (platform == "mac")
                     {
                         atlPlatform = "mac";
                     }
diff --git a/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
index ad2ba28269..7fabfb75b3 100644
--- a/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
+++ b/Gems/AudioEngineWwise/Code/Source/Engine/Config_wwise.h
@@ -46,7 +46,7 @@ namespace Audio::Wwise
             ~PlatformMapping() = default;
 
             // Serialized Data...
-            AZStd::string m_assetPlatform;      // LY Asset Platform name (i.e. "pc", "osx_gl", "es3", ...)
+            AZStd::string m_assetPlatform;      // LY Asset Platform name (i.e. "pc", "mac", "android", ...)
             AZStd::string m_altAssetPlatform;   // Some platforms can be run using a different asset platform.  Useful for builder worker.
             AZStd::string m_enginePlatform;     // LY Engine Platform name (i.e. "Windows", "Mac", "Android", ...)
             AZStd::string m_wwisePlatform;      // Wwise Platform name (i.e. "Windows", "Mac", "Android", ...)
diff --git a/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Android/wwise_config_android.json b/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Android/wwise_config_android.json
index 22cc632cbd..38f6ff142e 100644
--- a/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Android/wwise_config_android.json
+++ b/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Android/wwise_config_android.json
@@ -1,5 +1,5 @@
 {
-    "assetPlatform": "es3",
+    "assetPlatform": "android",
     "altAssetPlatform": "",
     "enginePlatform": "Android",
     "wwisePlatform": "Android",
diff --git a/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Mac/wwise_config_mac.json b/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Mac/wwise_config_mac.json
index 4069d8add7..a996b85150 100644
--- a/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Mac/wwise_config_mac.json
+++ b/Gems/AudioEngineWwise/Tools/WwiseConfig/Platform/Mac/wwise_config_mac.json
@@ -1,5 +1,5 @@
 {
-    "assetPlatform": "osx_gl",
+    "assetPlatform": "mac",
     "altAssetPlatform": "",
     "enginePlatform": "Mac",
     "wwisePlatform": "Mac",
diff --git a/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp b/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
index 0336ae8c09..6c4c78c412 100644
--- a/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
+++ b/Gems/Blast/Code/Source/Actor/BlastActorImpl.cpp
@@ -68,7 +68,7 @@ namespace Blast
 
         auto transform = AZ::Transform::CreateFromQuaternionAndTranslation(
             m_bodyConfiguration.m_orientation, m_bodyConfiguration.m_position);
-        transform.MultiplyByScale(AZ::Vector3(m_scale));
+        transform.MultiplyByUniformScale(m_scale);
 
         AZ::TransformBus::Event(m_entity->GetId(), &AZ::TransformInterface::SetWorldTM, transform);
 
diff --git a/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
index 5fe1e0ab30..25c0f904e3 100644
--- a/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
+++ b/Gems/Blast/Code/Source/Family/BlastFamilyImpl.cpp
@@ -202,7 +202,7 @@ namespace Blast
             if (parentBody)
             {
                 parentTransform = parentBody->GetTransform();
-                parentTransform.MultiplyByScale(AZ::Vector3(m_initialTransform.GetScale().GetMaxElement()));
+                parentTransform.MultiplyByUniformScale(m_initialTransform.GetUniformScale());
             }
             else
             {
@@ -254,7 +254,7 @@ namespace Blast
         actorDesc.m_parentCenterOfMass = transform.GetTranslation();
         actorDesc.m_parentLinearVelocity = AZ::Vector3::CreateZero();
         actorDesc.m_bodyConfiguration = configuration;
-        actorDesc.m_scale = transform.GetScale().GetMaxElement();
+        actorDesc.m_scale = transform.GetUniformScale();
 
         return actorDesc;
     }
diff --git a/Gems/Blast/Code/Tests/Mocks/BlastMocks.h b/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
index bd03a442d9..00aa12cb84 100644
--- a/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
+++ b/Gems/Blast/Code/Tests/Mocks/BlastMocks.h
@@ -644,19 +644,7 @@ namespace Blast
         MOCK_METHOD0(GetLocalX, float());
         MOCK_METHOD0(GetLocalY, float());
         MOCK_METHOD0(GetLocalZ, float());
-        MOCK_METHOD1(SetRotation, void(const AZ::Vector3&));
-        MOCK_METHOD1(SetRotationX, void(float));
-        MOCK_METHOD1(SetRotationY, void(float));
-        MOCK_METHOD1(SetRotationZ, void(float));
-        MOCK_METHOD1(SetRotationQuaternion, void(const AZ::Quaternion&));
-        MOCK_METHOD1(RotateByX, void(float));
-        MOCK_METHOD1(RotateByY, void(float));
-        MOCK_METHOD1(RotateByZ, void(float));
-        MOCK_METHOD0(GetRotationEulerRadians, AZ::Vector3());
-        MOCK_METHOD0(GetRotationQuaternion, AZ::Quaternion());
-        MOCK_METHOD0(GetRotationX, float());
-        MOCK_METHOD0(GetRotationY, float());
-        MOCK_METHOD0(GetRotationZ, float());
+        MOCK_METHOD1(SetWorldRotationQuaternion, void(const AZ::Quaternion&));
         MOCK_METHOD0(GetWorldRotation, AZ::Vector3());
         MOCK_METHOD0(GetWorldRotationQuaternion, AZ::Quaternion());
         MOCK_METHOD1(SetLocalRotation, void(const AZ::Vector3&));
diff --git a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
index 1f677d7b6f..1304c7b392 100644
--- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
+++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp
@@ -274,12 +274,15 @@ namespace DebugDraw
         AzFramework::DebugDisplayRequests* debugDisplay =
             AzFramework::DebugDisplayRequestBus::FindFirstHandler(debugDisplayBus);
 
-        OnTickAabbs(*debugDisplay);
-        OnTickLines(*debugDisplay);
-        OnTickObbs(*debugDisplay);
-        OnTickRays(*debugDisplay);
-        OnTickSpheres(*debugDisplay);
-        OnTickText(*debugDisplay);
+        if (debugDisplay)
+        {
+            OnTickAabbs(*debugDisplay);
+            OnTickLines(*debugDisplay);
+            OnTickObbs(*debugDisplay);
+            OnTickRays(*debugDisplay);
+            OnTickSpheres(*debugDisplay);
+            OnTickText(*debugDisplay);
+        }
     }
 
     template <typename F>
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
index 3a23241385..b2389a3086 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.cpp
@@ -1297,18 +1297,6 @@ namespace MCommon
     }
 
 
-    // render a cube
-    void RenderUtil::RenderCube(const AZ::Vector3& size, const AZ::Vector3& position, const MCore::RGBAColor& color)
-    {
-        // setup the world space matrix of the cube
-        AZ::Transform cubeTransform = AZ::Transform::CreateScale(size);
-        cubeTransform.SetTranslation(position);
-
-        // render the cube
-        RenderCube(color, cubeTransform);
-    }
-
-
     // construct the arrow head mesh used for rendering
     RenderUtil::UtilMesh* RenderUtil::CreateArrowHead(float height, float radius)
     {
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
index 86e41e56ef..b724c28720 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/RenderUtil.h
@@ -297,14 +297,6 @@ namespace MCommon
          */
         void RenderCylinder(float baseRadius, float topRadius, float length, const AZ::Vector3& position, const AZ::Vector3& direction, const MCore::RGBAColor& color);
 
-        /**
-         * Render a cube.
-         * @param size The size of the cube.
-         * @param position The position of the center of the cube.
-         * @param color The desired cube color.
-         */
-        void RenderCube(const AZ::Vector3& size, const AZ::Vector3& position, const MCore::RGBAColor& color);
-
         /**
          * Render a triangle (CCW).
          * @param v1 The first corner of the triangle.
diff --git a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
index 32b779f385..54ccd00535 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Rendering/Common/ScaleManipulator.cpp
@@ -169,7 +169,6 @@ namespace MCommon
         if (mXAxisVisible)
         {
             renderUtil->RenderLine(mPosition, mPosition + mSignX * AZ::Vector3(mScaledSize.GetX() + 0.5f * mBaseRadius, 0.0f, 0.0f), xAxisColor);
-            //renderUtil->RenderCube( Vector3(mBaseRadius, mBaseRadius, mBaseRadius), mPosition + mSignX * Vector3(mScaledSize.x+mBaseRadius, 0, 0), ManipulatorColors::mRed );
             AZ::Vector3 quadPos = MCore::Project(mPosition + mSignX * AZ::Vector3(mScaledSize.GetX() + mBaseRadius, 0, 0), camera->GetViewProjMatrix(), screenWidth, screenHeight);
             renderUtil->RenderBorderedRect(static_cast<int32>(quadPos.GetX() - 2.0f), static_cast<int32>(quadPos.GetX() + 3.0f), static_cast<int32>(quadPos.GetY() - 2.0f), static_cast<int32>(quadPos.GetY() + 3.0f), ManipulatorColors::mRed, ManipulatorColors::mRed);
 
@@ -186,7 +185,6 @@ namespace MCommon
         if (mYAxisVisible)
         {
             renderUtil->RenderLine(mPosition, mPosition + mSignY * AZ::Vector3(0.0f, mScaledSize.GetY(), 0.0f), yAxisColor);
-            //renderUtil->RenderCube( Vector3(mBaseRadius, mBaseRadius, mBaseRadius), mPosition + mSignY * Vector3(0, mScaledSize.y+0.5*mBaseRadius, 0), ManipulatorColors::mGreen );
             AZ::Vector3 quadPos = MCore::Project(mPosition + mSignY * AZ::Vector3(0, mScaledSize.GetY() + 0.5f * mBaseRadius, 0), camera->GetViewProjMatrix(), screenWidth, screenHeight);
             renderUtil->RenderBorderedRect(static_cast<int32>(quadPos.GetX() - 2.0f), static_cast<int32>(quadPos.GetX() + 3.0f), static_cast<int32>(quadPos.GetY() - 2.0f), static_cast<int32>(quadPos.GetY() + 3.0f), ManipulatorColors::mGreen, ManipulatorColors::mGreen);
 
@@ -203,7 +201,6 @@ namespace MCommon
         if (mZAxisVisible)
         {
             renderUtil->RenderLine(mPosition, mPosition + mSignZ * AZ::Vector3(0.0f, 0.0f, mScaledSize.GetZ()), zAxisColor);
-            //renderUtil->RenderCube( Vector3(mBaseRadius, mBaseRadius, mBaseRadius), mPosition + mSignZ * Vector3(0, 0, mScaledSize.z+0.5*mBaseRadius), ManipulatorColors::mBlue );
             AZ::Vector3 quadPos = MCore::Project(mPosition + mSignZ * AZ::Vector3(0, 0, mScaledSize.GetZ() + 0.5f * mBaseRadius), camera->GetViewProjMatrix(), screenWidth, screenHeight);
             renderUtil->RenderBorderedRect(static_cast<int32>(quadPos.GetX() - 2.0f), static_cast<int32>(quadPos.GetX() + 3.0f), static_cast<int32>(quadPos.GetY() - 2.0f), static_cast<int32>(quadPos.GetY() + 3.0f), ManipulatorColors::mBlue, ManipulatorColors::mBlue);
 
diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
index b2322b5379..e3195beba9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/Transform.cpp
@@ -183,7 +183,7 @@ namespace EMotionFX
     {
     #ifndef EMFX_SCALE_DISABLED
         mPosition = transform.GetTranslation();
-        mScale = transform.GetScale();
+        mScale = AZ::Vector3(transform.GetUniformScale());
         mRotation = transform.GetRotation();
     #else
         mPosition = transform.GetTranslation();
diff --git a/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h b/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
index 519d44dace..fdead82491 100644
--- a/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
+++ b/Gems/EMotionFX/Code/MCore/Source/AzCoreConversions.h
@@ -58,7 +58,7 @@ namespace MCore
         AZ::Transform transform = AZ::Transform::CreateFromQuaternionAndTranslation(emfxTransform.mRotation, emfxTransform.mPosition);
         EMFX_SCALECODE
         (
-            transform.MultiplyByScale(emfxTransform.mScale);
+            transform.MultiplyByUniformScale(emfxTransform.mScale.GetMaxElement());
         )
         return transform;
     }
@@ -386,7 +386,7 @@ namespace MCore
         AZ::Transform result;
         result.SetTranslation(translation);
         result.SetRotation(rotation);
-        result.SetScale(scale);
+        result.SetUniformScale(scale.GetMaxElement());
         return result;
     }
 
diff --git a/Gems/EMotionFX/Code/MCore/Source/OBB.cpp b/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
index bb73f9413b..e7a0011684 100644
--- a/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
+++ b/Gems/EMotionFX/Code/MCore/Source/OBB.cpp
@@ -96,9 +96,9 @@ namespace MCore
         // create the AABB of (box1 in space of box0)
         const AZ::Transform& mtx = _1in0.mRotation;
 
-        AZ::Vector3 transformedAxisX = mtx.GetScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisX()));
-        AZ::Vector3 transformedAxisY = mtx.GetScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisY()));
-        AZ::Vector3 transformedAxisZ = mtx.GetScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisZ()));
+        AZ::Vector3 transformedAxisX = mtx.GetUniformScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisX()));
+        AZ::Vector3 transformedAxisY = mtx.GetUniformScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisY()));
+        AZ::Vector3 transformedAxisZ = mtx.GetUniformScale() * (mtx.GetRotation().GetConjugate().TransformVector(AZ::Vector3::CreateAxisZ()));
 
         float f = transformedAxisX.GetAbs().Dot(mExtents) - box.mExtents.GetX();
         if (f > _1in0.mCenter.GetX())
diff --git a/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
index b3acb73e19..446abbf6af 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/PhysicsRagdoll.h
@@ -26,7 +26,7 @@ namespace EMotionFX
         MOCK_METHOD0(DisableSimulation, void());
         MOCK_METHOD0(DisableSimulationQueued, void());
 
-        MOCK_METHOD0(IsSimulated, bool());
+        MOCK_CONST_METHOD0(IsSimulated, bool());
 
         MOCK_CONST_METHOD1(GetState, void(Physics::RagdollState&));
         MOCK_METHOD1(SetState, void(const Physics::RagdollState&));
diff --git a/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h b/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
index 04a1ca4f81..f8c70a5fee 100644
--- a/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
+++ b/Gems/EMotionFX/Code/Tests/SystemComponentFixture.h
@@ -59,7 +59,16 @@ namespace EMotionFX
     {
     public:
 
-        ComponentFixtureApp() = default;
+        ComponentFixtureApp()
+        {
+            using FixedValueString = AZ::SettingsRegistryInterface::FixedValueString;
+            constexpr auto projectPathKey = FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            if(auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
+            {
+                settingsRegistry->Set(projectPathKey, "AutomatedTesting");
+                AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*settingsRegistry);
+            }
+        }
 
         AZ::ComponentTypeList GetRequiredSystemComponents() const override
         {
diff --git a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
index 8045499b4a..8e3a19c1ca 100644
--- a/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
+++ b/Gems/EMotionFX/Code/Tests/UI/CanUseFileMenu.cpp
@@ -77,7 +77,6 @@ namespace EMotionFX
         {
             auto testAssetsPath = AZ::IO::Path(GetEMotionFX().GetAssetCacheFolder()) / "TmpTestAssets";
             QString dataDir = QString::fromUtf8(testAssetsPath.c_str(), aznumeric_cast<int>(testAssetsPath.Native().size()));
-            dataDir += "TmpTestAssets";
 
             if (!QDir(dataDir).exists())
             {
diff --git a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
index 86628d08a1..440638c61f 100644
--- a/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
+++ b/Gems/EditorPythonBindings/Code/Tests/EditorPythonBindingsTest.cpp
@@ -18,6 +18,7 @@
 #include <EditorPythonBindings/EditorPythonBindingsBus.h>
 
 #include <AzCore/Debug/TraceMessageBus.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/API/EditorPythonRunnerRequestsBus.h>
 
@@ -322,6 +323,13 @@ sys.version
         void SetUp() override
         {
             PythonTestingFixture::SetUp();
+
+            auto registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey = AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey)
+                + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_app.RegisterComponentDescriptor(EditorPythonBindings::PythonSystemComponent::CreateDescriptor());
         }
 
diff --git a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
index e935ed4009..1026c8addc 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CapsuleShape.cpp
@@ -203,7 +203,7 @@ namespace LmbrCentral
         const AZ::Transform& currentTransform, const CapsuleShapeConfig& configuration,
         [[maybe_unused]] const AZ::Vector3& currentNonUniformScale)
     {
-        const float entityScale = currentTransform.GetScale().GetMaxElement();
+        const float entityScale = currentTransform.GetUniformScale();
         m_axisVector = currentTransform.GetBasisZ().GetNormalizedSafe() * entityScale;
 
         const float internalCylinderHeight = configuration.m_height - configuration.m_radius * 2.0f;
diff --git a/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
index 047261862f..a0ba157fc1 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/CylinderShape.cpp
@@ -273,7 +273,7 @@ namespace LmbrCentral
         const AZ::Transform& currentTransform, const CylinderShapeConfig& configuration,
         [[maybe_unused]] const AZ::Vector3& currentNonUniformScale)
     {
-        const float entityScale = currentTransform.GetScale().GetMaxElement();
+        const float entityScale = currentTransform.GetUniformScale();
         m_axisVector = currentTransform.GetBasisZ().GetNormalizedSafe() * entityScale;
         m_baseCenterPoint = currentTransform.GetTranslation() - m_axisVector * (configuration.m_height * 0.5f);
         m_axisVector = m_axisVector * configuration.m_height;
diff --git a/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
index a302a83316..6aff6ed98c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/DiskShape.cpp
@@ -167,7 +167,7 @@ namespace LmbrCentral
     {
         m_position = currentTransform.GetTranslation();
         m_normal = currentTransform.GetBasisZ().GetNormalized();
-        m_radius = configuration.m_radius * currentTransform.GetScale().GetMaxElement();
+        m_radius = configuration.m_radius * currentTransform.GetUniformScale();
     }
 
     const DiskShapeConfig& DiskShape::GetDiskConfiguration() const
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
index c0b49b8e55..e323d58c2a 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorBoxShapeComponent.cpp
@@ -174,6 +174,6 @@ namespace LmbrCentral
 
     AZ::Vector3 EditorBoxShapeComponent::GetBoxScale()
     {
-        return AZ::Vector3(m_boxShape.GetCurrentTransform().GetScale().GetMaxElement() * m_boxShape.GetCurrentNonUniformScale());
+        return AZ::Vector3(m_boxShape.GetCurrentTransform().GetUniformScale() * m_boxShape.GetCurrentNonUniformScale());
     }
 } // namespace LmbrCentral
diff --git a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
index 212ec49c93..44ed73733c 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/EditorSplineComponent.cpp
@@ -349,7 +349,7 @@ namespace LmbrCentral
         const AZ::Vector3& src, const AZ::Vector3& dir, float& distance)
     {
         const auto rayIntersectData = IntersectSpline(m_cachedUniformScaleTransform, src, dir, *m_splineCommon.m_spline);
-        distance = rayIntersectData.m_rayDistance * m_cachedUniformScaleTransform.GetScale().GetMaxElement();
+        distance = rayIntersectData.m_rayDistance * m_cachedUniformScaleTransform.GetUniformScale();
 
         AzFramework::CameraState cameraState;
         AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::EventResult(
diff --git a/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
index c06d38a612..05472df8be 100644
--- a/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
+++ b/Gems/LmbrCentral/Code/Source/Shape/SphereShape.cpp
@@ -136,7 +136,7 @@ namespace LmbrCentral
         [[maybe_unused]] const AZ::Vector3& currentNonUniformScale)
     {
         m_position = currentTransform.GetTranslation();
-        m_radius = configuration.m_radius * currentTransform.GetScale().GetMaxElement();
+        m_radius = configuration.m_radius * currentTransform.GetUniformScale();
     }
 
     void DrawSphereShape(
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
index f082ef74f9..44fe70af80 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/CopyDependencyBuilderTest.cpp
@@ -217,6 +217,9 @@ protected:
     const char* GetAbsoluteDevGameFolderPath() override { return ""; }
     const char* GetAbsoluteDevRootFolderPath() override { return ""; }
     bool GetRelativeProductPathFromFullSourceOrProductPath([[maybe_unused]] const AZStd::string& fullPath, [[maybe_unused]] AZStd::string& relativeProductPath) { return true; }
+    bool GenerateRelativeSourcePath(
+        [[maybe_unused]] const AZStd::string& sourcePath, [[maybe_unused]] AZStd::string& relativePath,
+        [[maybe_unused]] AZStd::string& watchFolder) { return true; }
     bool GetFullSourcePathFromRelativeProductPath([[maybe_unused]] const AZStd::string& relPath, [[maybe_unused]] AZStd::string& fullSourcePath) { return true; }
     bool GetAssetInfoById([[maybe_unused]] const AZ::Data::AssetId& assetId, [[maybe_unused]] const AZ::Data::AssetType& assetType, [[maybe_unused]] const AZStd::string& platformName, [[maybe_unused]] AZ::Data::AssetInfo& assetInfo, [[maybe_unused]] AZStd::string& rootFilePath) { return true; }
     bool GetSourceInfoBySourcePath([[maybe_unused]] const char* sourcePath, [[maybe_unused]] AZ::Data::AssetInfo& assetInfo, [[maybe_unused]] AZStd::string& watchFolder) { return true; }
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
index 58e7e9e093..470a2abff6 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
@@ -15,6 +15,7 @@
 #include <Builders/LevelBuilder/LevelBuilderWorker.h>
 #include <AzTest/Utils.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/Slice/SliceAssetHandler.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
@@ -98,6 +99,12 @@ class LevelBuilderTest
 protected:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+        
         m_app.Start(m_descriptor);
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
         // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
index b8911738f7..99213484fc 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/LuaBuilderTests.cpp
@@ -15,6 +15,7 @@
 #include <Builders/LuaBuilder/LuaBuilderWorker.h>
 #include <AzTest/Utils.h>
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzCore/Utils/Utils.h>
@@ -32,6 +33,12 @@ namespace UnitTest
     {
         void SetUp() override
         {
+            AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+            auto projectPathKey =
+                AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+            registry->Set(projectPathKey, "AutomatedTesting");
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
             m_app.Start(m_descriptor);
             // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
             // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
index 20dd3db446..49fc06c160 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/SeedBuilderTests.cpp
@@ -12,6 +12,7 @@
 
 #include "LmbrCentral_precompiled.h"
 #include <AzTest/AzTest.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
 #include <Builders/DependencyBuilder/SeedBuilderWorker/SeedBuilderWorker.h>
@@ -22,6 +23,12 @@ class SeedBuilderTests
 {
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+        
         m_app.Start(AZ::ComponentApplication::Descriptor());
 
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Gems/LyShine/Assets/Editor/Icons/Viewport/Canvas_Background.tif.assetinfo b/Gems/LyShine/Assets/Editor/Icons/Viewport/Canvas_Background.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShine/Assets/Editor/Icons/Viewport/Canvas_Background.tif.assetinfo
+++ b/Gems/LyShine/Assets/Editor/Icons/Viewport/Canvas_Background.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShine/Code/Editor/ViewportHelpers.cpp b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
index 428554a461..2195d2c9d4 100644
--- a/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
@@ -30,6 +30,11 @@ namespace ViewportHelpers
         return isControlledByParent;
     }
 
+    float GetDpiScaledSize(float size)
+    {
+        return size * ViewportIcon::GetDpiScaleFactor();
+    }
+
     bool IsHorizontallyFit(const AZ::Entity* element)
     {
         bool isHorizontallyFit = false;
@@ -332,11 +337,12 @@ namespace ViewportHelpers
 
             AZ::Vector2 pivotPos;
             EBUS_EVENT_ID_RESULT(pivotPos, element->GetId(), UiTransformBus, GetViewportSpacePivot);
-            AZ::Vector2 rotationStringPos(pivotPos.GetX(), pivotPos.GetY() - ((viewportPivot->GetSize().GetY() * 0.5f) + 4.0f));
+            float offset = (viewportPivot->GetSize().GetY() * 0.5f) + (GetDpiScaledSize(4.0f));
+            AZ::Vector2 rotationStringPos(pivotPos.GetX(), pivotPos.GetY() - offset);
 
             draw2d.SetTextAlignment(IDraw2d::HAlign::Center, IDraw2d::VAlign::Bottom);
             draw2d.SetTextRotation(0.0f);
-            draw2d.DrawText(rotationString.toUtf8().data(), rotationStringPos, 16.0f, 1.0f);
+            draw2d.DrawText(rotationString.toUtf8().data(), rotationStringPos, GetDpiScaledSize(16.0f), 1.0f);
         }
     }
 
@@ -350,6 +356,6 @@ namespace ViewportHelpers
 
         draw2d.SetTextAlignment(IDraw2d::HAlign::Left, IDraw2d::VAlign::Bottom);
         draw2d.SetTextRotation(0.0f);
-        draw2d.DrawText(textLabel.c_str(), textPos, 16.0f, 1.0f);
+        draw2d.DrawText(textLabel.c_str(), textPos, GetDpiScaledSize(16.0f), 1.0f);
     }
 }   // namespace ViewportHelpers
diff --git a/Gems/LyShine/Code/Editor/ViewportIcon.cpp b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
index b1866efb00..4be06b2543 100644
--- a/Gems/LyShine/Code/Editor/ViewportIcon.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
@@ -303,7 +303,7 @@ void ViewportIcon::DrawDistanceLine(Draw2dHelper& draw2d, AZ::Vector2 start, AZ:
 
     draw2d.SetTextAlignment(IDraw2d::HAlign::Center, IDraw2d::VAlign::Bottom);
     draw2d.SetTextRotation(rotation);
-    draw2d.DrawText(textBuf, textPos, 16.0f, 1.0f);
+    draw2d.DrawText(textBuf, textPos, 16.0f * ViewportIcon::GetDpiScaleFactor(), 1.0f);
 }
 
 void ViewportIcon::DrawAnchorLinesSplit(Draw2dHelper& draw2d, AZ::Vector2 anchorPos1, AZ::Vector2 anchorPos2,
diff --git a/Gems/LyShine/Code/Include/LyShine/Draw2d.h b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
index 8270461e73..b83ec4794b 100644
--- a/Gems/LyShine/Code/Include/LyShine/Draw2d.h
+++ b/Gems/LyShine/Code/Include/LyShine/Draw2d.h
@@ -15,6 +15,7 @@
 #include <LyShine/ILyShine.h>
 #include <LyShine/Bus/UiTransformBus.h>
 
+#include <AzFramework/Font/FontInterface.h>
 #include <Atom/Bootstrap/BootstrapNotificationBus.h>
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
 #include <Atom/RPI.Reflect/Image/Image.h>
@@ -256,9 +257,8 @@ protected: // types and constants
             const Draw2dShaderData& shaderData,
             AZ::RPI::ViewportContextPtr viewportContext) const override;
 
-        STextDrawContext    m_fontContext;
-        IFFont*             m_font;
-        AZ::Vector2         m_position;
+        AzFramework::TextDrawParameters m_drawParameters;
+        AzFramework::FontId m_fontId;
         std::string         m_string;
     };
 
@@ -288,7 +288,7 @@ protected: // member functions
     void RotatePointsAboutPivot(AZ::Vector2* points, int numPoints, AZ::Vector2 pivot, float angle) const;
 
     //! Helper function to render a text string
-    void DrawTextInternal(const char* textString, IFFont* font, unsigned int effectIndex,
+    void DrawTextInternal(const char* textString, AzFramework::FontId fontId, unsigned int effectIndex,
         AZ::Vector2 position, float pointSize, AZ::Color color, float rotation,
         HAlign horizontalAlignment, VAlign verticalAlignment, int baseState);
 
@@ -298,6 +298,9 @@ protected: // member functions
     //! Draw or defer a line
     void DrawOrDeferLine(const DeferredLine* line);
 
+    //! Draw or defer a text string
+    void DrawOrDeferTextString(const DeferredText* text);
+
     //! Draw or defer a rect outline
     void DrawOrDeferRectOutline(const DeferredRectOutline* outlineRect);
 
@@ -491,7 +494,7 @@ public: // member functions
     void SetImageBaseState(int state) { m_imageOptions.baseState = state; }
 
     //! Set the text font.
-    void SetTextFont(IFFont* font) { m_textOptions.font = font; }
+    void SetTextFont(AZStd::string_view fontName) { m_textOptions.fontName = fontName; }
 
     //! Set the text font effect index.
     void SetTextEffectIndex(unsigned int effectIndex) { m_textOptions.effectIndex = effectIndex; }
diff --git a/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp
index 1a639ea299..6feb47419d 100644
--- a/Gems/LyShine/Code/Source/Draw2d.cpp
+++ b/Gems/LyShine/Code/Source/Draw2d.cpp
@@ -11,11 +11,13 @@
 */
 #include "LyShine_precompiled.h"
 #include "IFont.h"
+#include <IRenderer.h> // for SVF_P3F_C4B_T2F which will be removed in a coming PR
 
 #include <LyShine/Draw2d.h>
 
 #include <AzCore/Math/Matrix3x3.h>
 #include <AzCore/Math/MatrixUtils.h>
+#include <AzFramework/Font/FontInterface.h>
 
 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
@@ -55,7 +57,7 @@ CDraw2d::CDraw2d(AZ::RPI::ViewportContextPtr viewportContext)
     m_defaultImageOptions.pixelRounding = Rounding::Nearest;
     m_defaultImageOptions.baseState = g_defaultBaseState;
 
-    m_defaultTextOptions.font = (gEnv && gEnv->pCryFont != nullptr) ? gEnv->pCryFont->GetFont("default") : nullptr;
+    m_defaultTextOptions.fontName = "default";
     m_defaultTextOptions.effectIndex = 0;
     m_defaultTextOptions.color.Set(1.0f, 1.0f, 1.0f);
     m_defaultTextOptions.horizontalAlignment = HAlign::Left;
@@ -283,13 +285,20 @@ void CDraw2d::DrawText(const char* textString, AZ::Vector2 position, float point
 {
     TextOptions* actualTextOptions = (textOptions) ? textOptions : &m_defaultTextOptions;
 
+    AzFramework::FontId fontId = AzFramework::InvalidFontId;
+    AzFramework::FontQueryInterface* fontQueryInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get();
+    if (fontQueryInterface)
+    {
+        fontId = fontQueryInterface->GetFontId(actualTextOptions->fontName);
+    }
+
     // render the drop shadow, if needed
     if ((actualTextOptions->dropShadowColor.GetA() > 0.0f) &&
         (actualTextOptions->dropShadowOffset.GetX() || actualTextOptions->dropShadowOffset.GetY()))
     {
         // calculate the drop shadow pos and render it
         AZ::Vector2 dropShadowPosition(position + actualTextOptions->dropShadowOffset);
-        DrawTextInternal(textString, actualTextOptions->font, actualTextOptions->effectIndex,
+        DrawTextInternal(textString, fontId, actualTextOptions->effectIndex,
             dropShadowPosition, pointSize, actualTextOptions->dropShadowColor,
             actualTextOptions->rotation,
             actualTextOptions->horizontalAlignment, actualTextOptions->verticalAlignment,
@@ -298,7 +307,7 @@ void CDraw2d::DrawText(const char* textString, AZ::Vector2 position, float point
 
     // draw the text string
     AZ::Color textColor = AZ::Color::CreateFromVector3AndFloat(actualTextOptions->color, opacity);
-    DrawTextInternal(textString, actualTextOptions->font, actualTextOptions->effectIndex,
+    DrawTextInternal(textString, fontId, actualTextOptions->effectIndex,
         position, pointSize, textColor,
         actualTextOptions->rotation,
         actualTextOptions->horizontalAlignment, actualTextOptions->verticalAlignment,
@@ -398,20 +407,35 @@ void CDraw2d::DrawRectOutlineTextured(AZ::Data::Instance<AZ::RPI::Image> image,
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 AZ::Vector2 CDraw2d::GetTextSize(const char* textString, float pointSize, TextOptions* textOptions)
 {
-    TextOptions* actualTextOptions = (textOptions) ? textOptions : &m_defaultTextOptions;
-
-    if (!actualTextOptions->font)
+    AzFramework::FontDrawInterface* fontDrawInterface = nullptr;
+    AzFramework::FontQueryInterface* fontQueryInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get();
+    if (fontQueryInterface)
+    {
+        TextOptions* actualTextOptions = (textOptions) ? textOptions : &m_defaultTextOptions;
+        AzFramework::FontId fontId = fontQueryInterface->GetFontId(actualTextOptions->fontName);
+        fontDrawInterface = fontQueryInterface->GetFontDrawInterface(fontId);
+    }
+    if (!fontDrawInterface)
     {
         return AZ::Vector2(0.0f, 0.0f);
     }
 
-    STextDrawContext fontContext;
-    fontContext.SetEffect(actualTextOptions->effectIndex);
-    fontContext.SetSizeIn800x600(false);
-    fontContext.SetSize(vector2f(pointSize, pointSize));
+    // Set up draw parameters
+    AzFramework::TextDrawParameters drawParams;
+    drawParams.m_drawViewportId = GetViewportContext()->GetId();
+    drawParams.m_position = AZ::Vector3(0.0f, 0.0f, 1.0f);
+    drawParams.m_effectIndex = 0;
+    drawParams.m_textSizeFactor = pointSize;
+    drawParams.m_scale = AZ::Vector2(1.0f, 1.0f);
+    drawParams.m_lineSpacing = 1.0f;
+    drawParams.m_monospace = false;
+    drawParams.m_depthTest = false;
+    drawParams.m_virtual800x600ScreenSize = false;
+    drawParams.m_scaleWithWindow = false;
+    drawParams.m_multiline = true;
 
-    Vec2 textSize = actualTextOptions->font->GetTextSize(textString, true, fontContext);
-    return AZ::Vector2(textSize.x, textSize.y);
+    AZ::Vector2 textSize = fontDrawInterface->GetTextSize(drawParams, textString);
+    return textSize;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -559,100 +583,89 @@ void CDraw2d::RotatePointsAboutPivot(AZ::Vector2* points, [[maybe_unused]] int n
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void CDraw2d::DrawTextInternal(const char* textString, IFFont* font, unsigned int effectIndex,
+void CDraw2d::DrawTextInternal(const char* textString, AzFramework::FontId fontId, unsigned int effectIndex,
     AZ::Vector2 position, float pointSize, AZ::Color color, float rotation,
-    HAlign horizontalAlignment, VAlign verticalAlignment, int baseState)
+    HAlign horizontalAlignment, VAlign verticalAlignment, [[maybe_unused]] int baseState)
 {
-    if (!font)
-    {
-        return;
-    }
-
-    STextDrawContext fontContext;
-    fontContext.SetEffect(effectIndex);
-    fontContext.SetSizeIn800x600(false);
-    fontContext.SetSize(vector2f(pointSize, pointSize));
-    fontContext.SetColor(ColorF(color.GetR(), color.GetG(), color.GetB(), color.GetA()));
-    fontContext.m_baseState = baseState;
-    fontContext.SetOverrideViewProjMatrices(false);
-
     // FFont.cpp uses the alpha value of the color to decide whether to use the color, if the alpha value is zero
     // (in a ColorB format) then the color set via SetColor is ignored and it usually ends up drawing with an alpha of 1.
     // This is not what we want so in this case do not draw at all.
-    if (!fontContext.IsColorOverridden())
+    if (AZ::IsClose(color.GetA(), 0.0f))
     {
         return;
     }
 
-    AZ::Vector2 alignedPosition;
-    if (horizontalAlignment == HAlign::Left && verticalAlignment == VAlign::Top)
+    // Convert Draw2d alignment to text alignment
+    AzFramework::TextHorizontalAlignment hAlignment = AzFramework::TextHorizontalAlignment::Left;
+    switch (horizontalAlignment)
     {
-        alignedPosition = position;
-    }
-    else
-    {
-        // we align based on the size of the default font effect, because we do not want the
-        // text to move when the font effect is changed
-        unsigned int fontEffectIndex = fontContext.m_fxIdx;
-        fontContext.SetEffect(0);
-        Vec2 textSize = font->GetTextSize(textString, true, fontContext);
-        fontContext.SetEffect(fontEffectIndex);
-
-        alignedPosition = Align(position, AZ::Vector2(textSize.x, textSize.y), horizontalAlignment, verticalAlignment);
+    case HAlign::Left:
+        hAlignment = AzFramework::TextHorizontalAlignment::Left;
+        break;
+    case HAlign::Center:
+        hAlignment = AzFramework::TextHorizontalAlignment::Center;
+        break;
+    case HAlign::Right:
+        hAlignment = AzFramework::TextHorizontalAlignment::Right;
+        break;
+    default:
+        AZ_Assert(false, "Attempting to draw text with unsupported horizontal alignment.");
+        break;
     }
 
-    int flags = 0;
+    AzFramework::TextVerticalAlignment vAlignment = AzFramework::TextVerticalAlignment::Top;
+    switch (verticalAlignment)
+    {
+    case VAlign::Top:
+        vAlignment = AzFramework::TextVerticalAlignment::Top;
+        break;
+    case VAlign::Center:
+        vAlignment = AzFramework::TextVerticalAlignment::Center;
+        break;
+    case VAlign::Bottom:
+        vAlignment = AzFramework::TextVerticalAlignment::Bottom;
+        break;
+    default:
+        AZ_Assert(false, "Attempting to draw text with unsupported vertical alignment.");
+        break;
+    }
+
+    // Set up draw parameters for font interface
+    AzFramework::TextDrawParameters drawParams;
+    drawParams.m_drawViewportId = GetViewportContext()->GetId();
+    drawParams.m_position = AZ::Vector3(position.GetX(), position.GetY(), 1.0f);
+    drawParams.m_color = color;
+    drawParams.m_effectIndex = effectIndex;
+    drawParams.m_textSizeFactor = pointSize;
+    drawParams.m_scale = AZ::Vector2(1.0f, 1.0f);
+    drawParams.m_lineSpacing = 1.0f; //!< Spacing between new lines, as a percentage of m_scale.
+    drawParams.m_hAlign = hAlignment;
+    drawParams.m_vAlign = vAlignment;
+    drawParams.m_monospace = false;
+    drawParams.m_depthTest = false;
+    drawParams.m_virtual800x600ScreenSize = false;
+    drawParams.m_scaleWithWindow = false;
+    drawParams.m_multiline = true;
+
     if (rotation != 0.0f)
     {
         // rotate around the position (if aligned to center will rotate about center etc)
         float rotRad = DEG2RAD(rotation);
-        Vec3 pivot(position.GetX(), position.GetY(), 0.0f);
-        Matrix34A moveToPivotSpaceMat = Matrix34A::CreateTranslationMat(-pivot);
-        Matrix34A rotMat = Matrix34A::CreateRotationZ(rotRad);
-        Matrix34A moveFromPivotSpaceMat = Matrix34A::CreateTranslationMat(pivot);
+        AZ::Vector3 pivot(position.GetX(), position.GetY(), 0.0f);
+        AZ::Matrix3x4 moveToPivotSpaceMat = AZ::Matrix3x4::CreateTranslation(-pivot);
+        AZ::Matrix3x4 rotMat = AZ::Matrix3x4::CreateRotationZ(rotRad);
+        AZ::Matrix3x4 moveFromPivotSpaceMat = AZ::Matrix3x4::CreateTranslation(pivot);
 
-        Matrix34A transform = moveFromPivotSpaceMat * rotMat * moveToPivotSpaceMat;
-        fontContext.SetTransform(transform);
-        flags |= eDrawText_UseTransform;
+        drawParams.m_transform = moveFromPivotSpaceMat * rotMat * moveToPivotSpaceMat;
+        drawParams.m_useTransform = true;
     }
 
-    // The font system uses these alignment flags to force text to be in the safe zone
-    // depending on overscan etc
-    if (horizontalAlignment == HAlign::Center)
-    {
-        flags |= eDrawText_Center;
-    }
-    else if (horizontalAlignment == HAlign::Right)
-    {
-        flags |= eDrawText_Right;
-    }
+    DeferredText newText;
+    newText.m_drawParameters = drawParams;
+    newText.m_fontId = fontId;
+    newText.m_string = textString;
 
-    if (verticalAlignment == VAlign::Center)
-    {
-        flags |= eDrawText_CenterV;
-    }
-    else if (verticalAlignment == VAlign::Bottom)
-    {
-        flags |= eDrawText_Bottom;
-    }
-
-    fontContext.SetFlags(flags);
-
-    if (m_deferCalls)
-    {
-        DeferredText* newText = new DeferredText;
-
-        newText->m_fontContext = fontContext;
-        newText->m_font = font;
-        newText->m_position = alignedPosition;
-        newText->m_string = textString;
-
-        m_deferredPrimitives.push_back(newText);
-    }
-    else
-    {
-        font->DrawString(alignedPosition.GetX(), alignedPosition.GetY(), textString, true, fontContext);
-    }
+    DrawOrDeferTextString(&newText);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -685,6 +698,20 @@ void CDraw2d::DrawOrDeferLine(const DeferredLine* line)
     }
 }
 
+void CDraw2d::DrawOrDeferTextString(const DeferredText* text)
+{
+    if (m_deferCalls)
+    {
+        DeferredText* newText = new DeferredText;
+        *newText = *text;
+        m_deferredPrimitives.push_back(newText);
+    }
+    else
+    {
+        text->Draw(m_dynamicDraw, m_shaderData, GetViewportContext());
+    }
+}
+
 void CDraw2d::DrawOrDeferRectOutline(const DeferredRectOutline* rectOutline)
 {
     if (m_deferCalls)
@@ -919,6 +946,15 @@ void CDraw2d::DeferredText::Draw([[maybe_unused]] AZ::RHI::Ptr<AZ::RPI::DynamicD
     [[maybe_unused]] const Draw2dShaderData& shaderData,
     [[maybe_unused]] AZ::RPI::ViewportContextPtr viewportContext) const
 {
-    m_font->DrawString(m_position.GetX(), m_position.GetY(), m_string.c_str(), true, m_fontContext);
+    AzFramework::FontDrawInterface* fontDrawInterface = nullptr;
+    AzFramework::FontQueryInterface* fontQueryInterface = AZ::Interface<AzFramework::FontQueryInterface>::Get();
+    if (fontQueryInterface)
+    {
+        fontDrawInterface = fontQueryInterface->GetFontDrawInterface(m_fontId);
+        if (fontDrawInterface)
+        {
+            fontDrawInterface->DrawScreenAlignedText2d(m_drawParameters, m_string.c_str());
+        }
+    }
 }
 
diff --git a/Gems/LyShine/Code/Source/LyShine.cpp b/Gems/LyShine/Code/Source/LyShine.cpp
index 679cae3421..fb6dcb2628 100644
--- a/Gems/LyShine/Code/Source/LyShine.cpp
+++ b/Gems/LyShine/Code/Source/LyShine.cpp
@@ -454,7 +454,6 @@ void CLyShine::Render()
 
     GetUiRenderer()->EndUiFrameRender();
 
-#ifdef LYSHINE_ATOM_TODO // convert debug info to Atom
 #ifndef _RELEASE
     if (CV_ui_DisplayElemBounds)
     {
@@ -474,7 +473,6 @@ void CLyShine::Render()
         m_uiCanvasManager->DebugDisplayDrawCallData();
     }
 #endif
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Gems/LyShine/Code/Source/LyShineDebug.cpp b/Gems/LyShine/Code/Source/LyShineDebug.cpp
index 76b4030106..44e0e187ec 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.cpp
+++ b/Gems/LyShine/Code/Source/LyShineDebug.cpp
@@ -12,6 +12,7 @@
 #include "LyShine_precompiled.h"
 #include "LyShineDebug.h"
 #include "IConsole.h"
+#include "IRenderer.h"
 #include <LyShine/Draw2d.h>
 
 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
@@ -392,15 +393,15 @@ static void DebugDrawColoredBox(AZ::Vector2 pos, AZ::Vector2 size, AZ::Color col
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #if !defined(_RELEASE)
-static void DebugDrawStringWithSizeBox(IFFont* font, unsigned int effectIndex, const char* sizeString,
+static void DebugDrawStringWithSizeBox(AZStd::string_view font, unsigned int effectIndex, const char* sizeString,
     const char* testString, AZ::Vector2 pos, float spacing, float size)
 {
     CDraw2d* draw2d = Draw2dHelper::GetDefaultDraw2d();
 
     IDraw2d::TextOptions textOptions = draw2d->GetDefaultTextOptions();
-    if (font)
+    if (!font.empty())
     {
-        textOptions.font = font;
+        textOptions.fontName = font;
     }
     textOptions.effectIndex = effectIndex;
 
@@ -427,7 +428,7 @@ static void DebugDrawStringWithSizeBox(IFFont* font, unsigned int effectIndex, c
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #if !defined(_RELEASE)
-static void DebugDraw2dFontSizes(IFFont* font, unsigned int effectIndex, const char* fontName)
+static void DebugDraw2dFontSizes(AZStd::string_view font, unsigned int effectIndex)
 {
     CDraw2d* draw2d = Draw2dHelper::GetDefaultDraw2d();
 
@@ -436,7 +437,7 @@ static void DebugDraw2dFontSizes(IFFont* font, unsigned int effectIndex, const c
     float xSpacing = 20.0f;
 
     char buffer[32];
-    sprintf_s(buffer, "Font = %s, effect = %d", fontName, effectIndex);
+    sprintf_s(buffer, "Font = %s, effect = %d", font.data(), effectIndex);
     draw2d->DrawText(buffer, AZ::Vector2(xOffset, yOffset), 32);
     yOffset += 40.0f;
     draw2d->DrawText("NOTE: if the effect includes a drop shadow baked into font then the pixel size",
@@ -1441,10 +1442,10 @@ void LyShineDebug::RenderDebug()
         switch (CV_r_DebugUIDraw2dFont)
         {
         case 1:     // test font sizes (default font, effect 0)
-            DebugDraw2dFontSizes(0, 0, "default");
+            DebugDraw2dFontSizes("default", 0);
             break;
         case 2:     // test font sizes (default font, effect 1)
-            DebugDraw2dFontSizes(0, 1, "default");
+            DebugDraw2dFontSizes("default", 1);
             break;
         case 3:     // test font alignment
             DebugDraw2dFontAlignment();
diff --git a/Gems/LyShine/Code/Source/LyShineDebug.h b/Gems/LyShine/Code/Source/LyShineDebug.h
index ed03fd10b2..e50689710a 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.h
+++ b/Gems/LyShine/Code/Source/LyShineDebug.h
@@ -14,7 +14,9 @@
 #ifndef _RELEASE
 #include <AzCore/std/containers/vector.h>
 
-class ITexture;
+#include <Atom/RPI.Reflect/Image/Image.h>
+#include <AtomCore/Instance/Instance.h>
+
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -66,7 +68,7 @@ public: // static member functions
 
     struct DebugInfoTextureUsage
     {
-        ITexture*   m_texture;
+        AZ::Data::Instance<AZ::RPI::Image> m_texture;
         bool        m_isClampTextureUsage;
         int         m_numCanvasesUsed;
         int         m_numDrawCallsUsed;
diff --git a/Gems/LyShine/Code/Source/RenderGraph.cpp b/Gems/LyShine/Code/Source/RenderGraph.cpp
index e5ac6c7b8f..d5a1df7b15 100644
--- a/Gems/LyShine/Code/Source/RenderGraph.cpp
+++ b/Gems/LyShine/Code/Source/RenderGraph.cpp
@@ -18,6 +18,7 @@
 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
 
 #ifndef _RELEASE
+#include <AzCore/Asset/AssetManagerBus.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #endif
 
@@ -1115,7 +1116,7 @@ namespace LyShine
 
         m_wasBuiltThisFrame = false;
 
-        AZStd::set<ITexture*> uniqueTextures;
+        AZStd::set<AZ::Data::Instance<AZ::RPI::Image>> uniqueTextures;
 
         // If we are rendering to the render targets this frame then record the stats for doing that
         if (m_renderToRenderTargetCount < 2)
@@ -1144,13 +1145,11 @@ namespace LyShine
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
-    void RenderGraph::GetDebugInfoRenderNodeList(const AZStd::vector<RenderNode*>& renderNodeList, LyShineDebug::DebugInfoRenderGraph& info, AZStd::set<ITexture*>& uniqueTextures) const
+    void RenderGraph::GetDebugInfoRenderNodeList(
+        const AZStd::vector<RenderNode*>& renderNodeList,
+        LyShineDebug::DebugInfoRenderGraph& info,
+        AZStd::set<AZ::Data::Instance<AZ::RPI::Image>>& uniqueTextures) const
     {
-        AZ_UNUSED(renderNodeList);
-        AZ_UNUSED(info);
-        AZ_UNUSED(uniqueTextures);
-
-#ifdef LYSHINE_ATOM_TODO // keeping this code for future phase (convert debug info to use Atom)
         const PrimitiveListRenderNode* prevPrimListNode = nullptr;
         bool isFirstNode = true;
         bool wasLastNodeAMask = false;
@@ -1235,7 +1234,6 @@ namespace LyShine
 
             isFirstNode = false;
         }
-#endif
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1290,13 +1288,6 @@ namespace LyShine
         void* context,
         const AZStd::string& indent) const
     {
-        AZ_UNUSED(renderNodeList);
-        AZ_UNUSED(fileHandle);
-        AZ_UNUSED(reportInfo);
-        AZ_UNUSED(context);
-        AZ_UNUSED(indent);
-
-#ifdef LYSHINE_ATOM_TODO // keeping this code for future phase (convert debug info to use Atom)
         AZStd::string logLine;
 
         bool previousNodeAlreadyCounted = false;
@@ -1355,10 +1346,10 @@ namespace LyShine
                     {
                         for (int i = 0; i < prevPrimListNode->GetNumTextures(); ++i)
                         {
-                            ITexture* texture = prevPrimListNode->GetTexture(i);
+                            AZ::Data::Instance<AZ::RPI::Image> texture = prevPrimListNode->GetTexture(i);
                             if (!texture)
                             {
-                                texture = gEnv->pRenderer->GetWhiteTexture();
+                                texture = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::White);
                             }
                             bool isClampTextureUsage = prevPrimListNode->GetTextureIsClampMode(i);
 
@@ -1405,17 +1396,19 @@ namespace LyShine
 
                 for (int i = 0; i < primListRenderNode->GetNumTextures(); ++i)
                 {
-                    ITexture* texture = primListRenderNode->GetTexture(i);
+                    AZ::Data::Instance<AZ::RPI::Image> texture = primListRenderNode->GetTexture(i);
                     if (!texture)
                     {
-                        texture = gEnv->pRenderer->GetWhiteTexture();
+                        texture = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::White);
                     }
                     bool isClampTextureUsage = primListRenderNode->GetTextureIsClampMode(i);
 
                     LyShineDebug::DebugInfoTextureUsage* matchingTextureUsage = nullptr;
 
                     // Write line to logfile for this texture
-                    logLine = AZStd::string::format("%s  %s\r\n", indent.c_str(), texture->GetName());
+                    AZStd::string textureName;
+                    AZ::Data::AssetCatalogRequestBus::BroadcastResult(textureName, &AZ::Data::AssetCatalogRequests::GetAssetPathById, texture->GetAssetId());
+                    logLine = AZStd::string::format("%s  %s\r\n", indent.c_str(), textureName.c_str());
                     AZ::IO::LocalFileIO::GetInstance()->Write(fileHandle, logLine.c_str(), logLine.size());
 
                     // see if texture is in reportInfo
@@ -1459,7 +1452,6 @@ namespace LyShine
                 prevPrimListNode = primListRenderNode;
             }
         }
-#endif
     }
 
 #endif
diff --git a/Gems/LyShine/Code/Source/RenderGraph.h b/Gems/LyShine/Code/Source/RenderGraph.h
index f9d16cf8b7..2f1586e857 100644
--- a/Gems/LyShine/Code/Source/RenderGraph.h
+++ b/Gems/LyShine/Code/Source/RenderGraph.h
@@ -13,7 +13,6 @@
 #pragma once
 
 #include <IRenderer.h>
-#include <IFont.h>
 #include <LyShine/IRenderGraph.h>
 #include <AzCore/Memory/PoolAllocator.h>
 #include <AzCore/std/containers/stack.h>
@@ -294,7 +293,10 @@ namespace LyShine
         void ValidateGraph();
 
         void GetDebugInfoRenderGraph(LyShineDebug::DebugInfoRenderGraph& info) const;
-        void GetDebugInfoRenderNodeList(const AZStd::vector<RenderNode*>& renderNodeList, LyShineDebug::DebugInfoRenderGraph& info, AZStd::set<ITexture*>& uniqueTextures) const;
+        void GetDebugInfoRenderNodeList(
+            const AZStd::vector<RenderNode*>& renderNodeList,
+            LyShineDebug::DebugInfoRenderGraph& info,
+            AZStd::set<AZ::Data::Instance<AZ::RPI::Image>>& uniqueTextures) const;
 
         void DebugReportDrawCalls(AZ::IO::HandleType fileHandle, LyShineDebug::DebugInfoDrawCallReport& reportInfo, void* context) const;
         void DebugReportDrawCallsRenderNodeList(const AZStd::vector<RenderNode*>& renderNodeList, AZ::IO::HandleType fileHandle,
diff --git a/Gems/LyShine/Code/Source/UiCanvasManager.cpp b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
index 4115feaf22..b64a13280f 100644
--- a/Gems/LyShine/Code/Source/UiCanvasManager.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
@@ -1425,7 +1425,8 @@ void UiCanvasManager::DebugReportDrawCalls(const AZStd::string& name) const
         if (reportTextureUsage.m_numCanvasesUsed > 1 &&
             reportTextureUsage.m_numDrawCallsWhereExceedingMaxTextures)
         {
-            AZStd::string textureName = reportTextureUsage.m_texture->GetName();
+            AZStd::string textureName;
+            AZ::Data::AssetCatalogRequestBus::BroadcastResult(textureName, &AZ::Data::AssetCatalogRequests::GetAssetPathById, reportTextureUsage.m_texture->GetAssetId());
             if (textureName.compare(0, fontTexturePrefix.length(), fontTexturePrefix) != 0)
             {
                 logLine = AZStd::string::format("%s\r\n", textureName.c_str());
@@ -1457,7 +1458,8 @@ void UiCanvasManager::DebugReportDrawCalls(const AZStd::string& name) const
                 reportTextureUsage.m_lastContextUsed == canvas &&
                 reportTextureUsage.m_numDrawCallsWhereExceedingMaxTextures)
             {
-                AZStd::string textureName = reportTextureUsage.m_texture->GetName();
+                AZStd::string textureName;
+                AZ::Data::AssetCatalogRequestBus::BroadcastResult(textureName, &AZ::Data::AssetCatalogRequests::GetAssetPathById, reportTextureUsage.m_texture->GetAssetId());
 
                 // exclude font textures
                 if (textureName.compare(0, fontTexturePrefix.length(), fontTexturePrefix) != 0)
diff --git a/Gems/LyShine/Code/Source/UiRenderer.cpp b/Gems/LyShine/Code/Source/UiRenderer.cpp
index 2a2c950e82..57acbed5d5 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.cpp
+++ b/Gems/LyShine/Code/Source/UiRenderer.cpp
@@ -12,6 +12,7 @@
 #include "LyShine_precompiled.h"
 #include "UiRenderer.h"
 
+#include <Atom/RPI.Public/Image/ImageSystemInterface.h>
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawInterface.h>
 #include <Atom/RPI.Public/RPISystemInterface.h>
 #include <Atom/RPI.Public/RPIUtils.h>
@@ -24,7 +25,7 @@
 #include <AzCore/Math/MatrixUtils.h>
 #include <AzCore/Debug/Trace.h>
 
-#include <LyShine/IDraw2d.h>
+#include <LyShine/Draw2d.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // PUBLIC MEMBER FUNCTIONS
@@ -353,7 +354,6 @@ void UiRenderer::DebugDisplayTextureData(int recordingOption)
 {
     if (recordingOption > 0)
     {
-#ifdef LYSHINE_ATOM_TODO
         // compute the total area of all the textures, also create a vector that we can sort by area
         AZStd::vector<ITexture*> textures;
         int totalArea = 0;
@@ -374,15 +374,14 @@ void UiRenderer::DebugDisplayTextureData(int recordingOption)
             return lhs->GetDataSize() > rhs->GetDataSize();
         });
 
-        IDraw2d* draw2d = Draw2dHelper::GetDraw2d();
+        CDraw2d* draw2d = Draw2dHelper::GetDefaultDraw2d();
 
         // setup to render lines of text for the debug display
-        draw2d->BeginDraw2d(false);
 
         float xOffset = 20.0f;
         float yOffset = 20.0f;
 
-        int blackTexture = gEnv->pRenderer->GetBlackTextureId();
+        auto blackTexture = AZ::RPI::ImageSystemInterface::Get()->GetSystemImage(AZ::RPI::SystemImage::Black);
         float textOpacity = 1.0f;
         float backgroundRectOpacity = 0.75f;
         const float lineSpacing = 20.0f;
@@ -432,9 +431,6 @@ void UiRenderer::DebugDisplayTextureData(int recordingOption)
                 texture->GetWidth(), texture->GetHeight(), texture->GetDataSize(), texture->GetFormatName(), texture->GetName());
             WriteLine(buffer, white);
         }
-
-        draw2d->EndDraw2d();
-#endif
     }
 }
 
diff --git a/Gems/LyShine/Code/Source/UiRenderer.h b/Gems/LyShine/Code/Source/UiRenderer.h
index 260bd8278c..888c88586a 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.h
+++ b/Gems/LyShine/Code/Source/UiRenderer.h
@@ -20,6 +20,8 @@
 #include <AzCore/std/containers/unordered_set.h>
 #endif
 
+class ITexture;
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //! UI render interface
 //
@@ -136,8 +138,6 @@ protected: // attributes
 
 #ifndef _RELEASE
     int m_debugTextureDataRecordLevel = 0;
-#ifdef LYSHINE_ATOM_TODO // Convert debug code to Atom
-    AZStd::unordered_set<ITexture*> m_texturesUsedInFrame;
-#endif
+    AZStd::unordered_set<ITexture*> m_texturesUsedInFrame; // LYSHINE_ATOM_TODO - convert to RPI::Image
 #endif
 };
diff --git a/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
index 9e57ac26fd..68da6e6009 100644
--- a/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
+++ b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
@@ -16,6 +16,7 @@
 #include <CryCommon/Mocks/ISystemMock.h>
 #include <LyShineBuilder/UiCanvasBuilderWorker.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzCore/Utils/Utils.h>
 #include <AzToolsFramework/Application/ToolsApplication.h>
@@ -88,6 +89,12 @@ protected:
         m_data->m_stubEnv.pSystem = &m_data->m_mockSystem;
         gEnv = &m_data->m_stubEnv;
 
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         m_app.Start(m_descriptor);
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
         // shared across the whole engine, if multiple tests are run in parallel, the saving could cause a crash 
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleFrame.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/CircleGradient.png.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/Circle_Shadow.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTest.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ColorTestPow2.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/ParticleGlow.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/button.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonPressed.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/buttonSlider.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkbox_spritesheet.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/checkered3.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/empty_icon.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/fixed_image.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/flipbook_walking.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/mask.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outline.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/outlineRounded.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/panelBkgd.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02_big.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern02vertical_big.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/pattern03_big.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_1.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_10.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_2.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_3.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_4.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_5.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_6.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_7.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_8.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_icon_9.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/scroll_box_map.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/selected.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInside2.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo
+++ b/Gems/LyShineExamples/Assets/UI/Textures/LyShineExamples/shadowInsideSquare.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
index 0bf913a89a..1393e7e12f 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/Components/NetworkTransformComponent.h
@@ -37,7 +37,7 @@ namespace Multiplayer
 
         void OnRotationChangedEvent(const AZ::Quaternion& rotation);
         void OnTranslationChangedEvent(const AZ::Vector3& translation);
-        void OnScaleChangedEvent(const AZ::Vector3& scale);
+        void OnScaleChangedEvent(float scale);
         void OnResetCountChangedEvent();
 
         AZ::Transform m_previousTransform = AZ::Transform::CreateIdentity();
@@ -45,7 +45,7 @@ namespace Multiplayer
 
         AZ::Event<AZ::Quaternion>::Handler m_rotationEventHandler;
         AZ::Event<AZ::Vector3>::Handler m_translationEventHandler;
-        AZ::Event<AZ::Vector3>::Handler m_scaleEventHandler;
+        AZ::Event<float>::Handler m_scaleEventHandler;
         AZ::Event<uint8_t>::Handler m_resetCountEventHandler;
 
         EntityPreRenderEvent::Handler m_entityPreRenderEventHandler;
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h
new file mode 100644
index 0000000000..01ae7b1207
--- /dev/null
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.h
@@ -0,0 +1,43 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzCore/std/containers/array.h>
+#include <AzNetworking/DataStructures/IBitset.h>
+#include <AzNetworking/Serialization/ISerializer.h>
+
+#include <Multiplayer/NetworkTime/RewindableObject.h>
+
+namespace Multiplayer
+{
+    //! @class RewindableArray
+    //! @brief Data structure that has a compile-time upper bound, provides array semantics and supports network serialization
+    template <typename TYPE, uint32_t SIZE>
+    class RewindableArray
+        : public AZStd::array<RewindableObject<TYPE, Multiplayer::RewindHistorySize>, SIZE>
+    {
+    public:
+        //! Serialization method for array contained rewindable objects
+        //! @param serializer ISerializer instance to use for serialization
+        //! @return bool true for success, false for serialization failure
+        bool Serialize(AzNetworking::ISerializer& serializer);
+
+        //! Serialization method for array contained rewindable objects
+        //! @param serializer ISerializer instance to use for serialization
+        //! @param deltaRecord Bitset delta record used to detect state change during reconciliation
+        //! @return bool true for success, false for serialization failure
+        bool Serialize(AzNetworking::ISerializer& serializer, AzNetworking::IBitset &deltaRecord);
+    };
+}
+
+#include <Multiplayer/NetworkTime/RewindableArray.inl>
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl
new file mode 100644
index 0000000000..6e496ae4ea
--- /dev/null
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableArray.inl
@@ -0,0 +1,53 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+namespace Multiplayer
+{
+    template <typename TYPE, uint32_t SIZE>
+    bool RewindableArray<TYPE, SIZE>::Serialize(AzNetworking::ISerializer& serializer)
+    {
+        for (uint32_t i = 0; i < SIZE; ++i)
+        {
+            if(!this[i].Serialize(serializer))
+            {
+                return false;
+            }
+        }
+
+        return serializer.IsValid();
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    bool RewindableArray<TYPE, SIZE>::Serialize(AzNetworking::ISerializer& serializer, AzNetworking::IBitset& deltaRecord)
+    {
+        for (uint32_t i = 0; i < SIZE; ++i)
+        {
+            if (deltaRecord.GetBit(i))
+            {
+                serializer.ClearTrackedChangesFlag();
+                if(!this[i].Serialize(serializer))
+                {
+                    return false;
+                }
+
+                if ((serializer.GetSerializerMode() == AzNetworking::SerializerMode::WriteToObject) && !serializer.GetTrackedChangesFlag())
+                {
+                    deltaRecord.SetBit(i, false);
+                }
+            }
+        }
+
+        return serializer.IsValid();
+    }
+}
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h
new file mode 100644
index 0000000000..c05fb98f72
--- /dev/null
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.h
@@ -0,0 +1,127 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+#include <AzCore/std/containers/array.h>
+#include <AzNetworking/DataStructures/IBitset.h>
+#include <AzNetworking/Serialization/ISerializer.h>
+
+#include <Multiplayer/NetworkTime/RewindableObject.h>
+
+namespace Multiplayer
+{
+    //! @class RewindableFixedVector
+    //! @brief Data structure that has a compile-time upper bound, provides vector semantics and supports network serialization
+    template <typename TYPE, uint32_t SIZE>
+    class RewindableFixedVector
+    {
+    public:
+        //! Default constructor
+        constexpr RewindableFixedVector() = default;
+
+        //! Construct and initialize buffer to the provided value
+        //! @param initialValue initial value to set the internal buffer to
+        //! @param count        initial value to reserve in the vector
+        constexpr RewindableFixedVector(const TYPE& initialValue, uint32_t count);
+
+        //! Destructor
+        ~RewindableFixedVector();
+
+        //! Serialization method for fixed vector contained rewindable objects
+        //! @param serializer ISerializer instance to use for serialization
+        //! @return bool true for success, false for serialization failure
+        bool Serialize(AzNetworking::ISerializer& serializer);
+
+        //! Serialization method for fixed vector contained rewindable objects
+        //! @param serializer ISerializer instance to use for serialization
+        //! @param deltaRecord Bitset delta record used to detect state change during reconciliation
+        //! @return bool true for success, false for serialization failure
+        bool Serialize(AzNetworking::ISerializer& serializer, AzNetworking::IBitset &deltaRecord);
+
+        //! Copies elements from the buffer pointed to by Buffer to this FixedSizeVector instance, vector size will be set to BufferSize
+        //! @param buffer     pointer to the buffer to copy
+        //! @param bufferSize number of elements in the buffer to copy
+        //! @return bool true on success, false if the input data was too large to fit in the vector
+        constexpr bool copy_values(const TYPE* buffer, uint32_t bufferSize);
+
+        //! Copy buffer from the provided vector
+        //! @param RHS instance to copy from
+        constexpr RewindableFixedVector<TYPE, SIZE>& operator=(const RewindableFixedVector<TYPE, SIZE>& rhs);
+
+        //! Equality operator, returns true if the current instance is equal to RHS
+        //! @param rhs the FixedSizeVector instance to test for equality against
+        //! @return bool true if equal, false if not
+        constexpr bool operator ==(const RewindableFixedVector<TYPE, SIZE>& rhs) const;
+
+        //! Inequality operator, returns true if the current instance is not equal to RHS
+        //! @param rhs the FixedSizeVector instance to test for inequality against
+        //! @return bool false if equal, true if not equal
+        constexpr bool operator !=(const RewindableFixedVector<TYPE, SIZE>& rhs) const;
+
+        //! Resizes the vector to the requested number of elements, initializing new elements if necessary
+        //! @param count the number of elements to size the vector to
+        //! @return bool true on success
+        constexpr bool resize(uint32_t count);
+
+        //! Resizes the vector to the requested number of elements, without initialization
+        //! @param count the number of elements to size the vector to
+        //! @return bool true on success
+        constexpr bool resize_no_construct(uint32_t count);
+
+        //! Resets the vector, returning it to size 0
+        constexpr void clear();
+
+        //! Const element access
+        //! @param Index index of the element to return
+        //! @return const reference to the requested element
+        constexpr const TYPE& operator[](uint32_t index) const;
+
+        //! Non-const element access
+        //! @param Index index of the element to return
+        //! @return non-const reference to the requested element
+        constexpr TYPE& operator[](uint32_t index);
+
+        //! Pushes a new element to the back of the vector
+        //! @param Value value to append to the back of this vector
+        //! @return boolean true on success, false if the vector was full
+        constexpr bool push_back(const TYPE& value);
+
+        //! Pops the last element off the vector, decreasing the vector's size by one
+        //! @return bool true on success, false if the vector was empty
+        constexpr bool pop_back();
+
+        //! Returns if the vector is empty
+        //! @return bool true on empty, false if the vector contains valid elements
+        constexpr bool empty() const;
+
+        //! Gets the last element of the vector
+        constexpr const TYPE& back() const;
+
+        //! Gets the size of the vector
+        constexpr uint32_t size() const;
+
+        typedef const RewindableObject<TYPE, Multiplayer::RewindHistorySize>* const_iterator;
+        const_iterator begin() const { return m_container.cbegin(); }
+        const_iterator end() const { return m_container.cbegin() + aznumeric_cast<size_t>(size()); }
+        typedef RewindableObject<TYPE, Multiplayer::RewindHistorySize>* iterator;
+        constexpr iterator begin() { return m_container.begin(); }
+        constexpr iterator end() { return m_container.begin() + aznumeric_cast<size_t>(size()); }
+
+    private:
+        AZStd::array<RewindableObject<TYPE, Multiplayer::RewindHistorySize>, SIZE> m_container;
+        // Synchronized value for vector size, prefer using size() locally which checks m_container.size()
+        RewindableObject<uint32_t, Multiplayer::RewindHistorySize> m_rewindableSize;
+    };
+}
+
+#include <Multiplayer/NetworkTime/RewindableFixedVector.inl>
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
new file mode 100644
index 0000000000..5690e51c35
--- /dev/null
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
@@ -0,0 +1,230 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+namespace Multiplayer
+{
+    template <typename TYPE, uint32_t SIZE>
+    constexpr RewindableFixedVector<TYPE, SIZE>::RewindableFixedVector(const TYPE& initialValue, uint32_t count)
+    {
+        m_container.fill(initialValue);
+        m_rewindableSize = count;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    RewindableFixedVector<TYPE, SIZE>::~RewindableFixedVector()
+    {
+        ;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    bool RewindableFixedVector<TYPE, SIZE>::Serialize(AzNetworking::ISerializer& serializer)
+    {
+        if(!m_rewindableSize.Serialize(serializer))
+        {
+            return false;
+        }
+
+        for (uint32_t idx = 0; idx < size(); ++idx)
+        {
+            if(!m_container[idx].Serialize(serializer))
+            {
+                return false;
+            }
+        }
+
+        return serializer.IsValid();
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    bool RewindableFixedVector<TYPE, SIZE>::Serialize(AzNetworking::ISerializer& serializer, AzNetworking::IBitset& deltaRecord)
+    {
+        if (deltaRecord.GetBit(SIZE))
+        {
+            const uint32_t origSize = m_rewindableSize;
+            if(!m_rewindableSize.Serialize(serializer))
+            {
+                return false;
+            }
+
+            if ((serializer.GetSerializerMode() == AzNetworking::SerializerMode::WriteToObject) && origSize == m_rewindableSize)
+            {
+                deltaRecord.SetBit(SIZE, false);
+            }
+        }
+        for (uint32_t idx = 0; idx < size(); ++idx)
+        {
+            if (deltaRecord.GetBit(idx))
+            {
+                serializer.ClearTrackedChangesFlag();
+                if(!m_container[idx].Serialize(serializer))
+                {
+                    return false;
+                }
+
+                if ((serializer.GetSerializerMode() == AzNetworking::SerializerMode::WriteToObject) && !serializer.GetTrackedChangesFlag())
+                {
+                    deltaRecord.SetBit(idx, false);
+                }
+            }
+        }
+
+        return serializer.IsValid();
+    }
+    
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::copy_values(const TYPE* buffer, uint32_t bufferSize)
+    {
+        if (!resize(bufferSize))
+        {
+            return false;
+        }
+
+        for (uint32_t idx = 0; idx < bufferSize; ++idx)
+        {
+            m_container[idx] = buffer[idx];
+        }
+        
+        return true;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr RewindableFixedVector<TYPE, SIZE>& RewindableFixedVector<TYPE, SIZE>::operator=(const RewindableFixedVector<TYPE, SIZE>& rhs)
+    {
+        resize(rhs.size());
+        for (uint32_t idx = 0; idx < size(); ++idx)
+        {
+            m_container[idx] = rhs.m_container[idx].Get();
+        }
+        return *this;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::operator ==(const RewindableFixedVector<TYPE, SIZE>& rhs) const
+    {
+        return m_container == rhs.m_container && m_rewindableSize == rhs.m_rewindableSize;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::operator !=(const RewindableFixedVector<TYPE, SIZE>& rhs) const
+    {
+        return !(*this == rhs);
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::resize(uint32_t count)
+    {
+        if (count > SIZE)
+        {
+            return false;
+        }
+
+        if (count == size())
+        {
+            return true;
+        }
+
+        if (count > size())
+        {
+            for (uint32_t idx = size(); idx < count; ++idx)
+            {
+                m_container[idx] = TYPE();
+            }
+        }
+        m_rewindableSize = count;
+
+        return true;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::resize_no_construct(uint32_t count)
+    {
+        if (count > SIZE)
+        {
+            return false;
+        }
+
+        m_rewindableSize = count;
+
+        return true;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr void RewindableFixedVector<TYPE, SIZE>::clear()
+    {
+        for (uint32_t idx = 0; idx < SIZE; ++idx)
+        {
+            m_container[idx] = TYPE();
+        }
+        m_rewindableSize = 0;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr const TYPE& RewindableFixedVector<TYPE, SIZE>::operator[](uint32_t index) const
+    {
+        AZ_Assert(index < size(), "Out of bounds access (requested %u, reserved %u)", index, size());
+        return m_container[index].Get();
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr TYPE& RewindableFixedVector<TYPE, SIZE>::operator[](uint32_t index)
+    {
+        AZ_Assert(index < size(), "Out of bounds access (requested %u, reserved %u)", index, size());
+        return m_container[index].Modify();
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::push_back(const TYPE& value)
+    {
+        if (size() < SIZE)
+        {
+            m_container[m_rewindableSize] = value;
+            m_rewindableSize = m_rewindableSize + 1;
+            return true;
+        }
+
+        return false;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::pop_back()
+    {
+        if (size() > 0)
+        {
+            m_rewindableSize = m_rewindableSize - 1;
+            m_container[m_rewindableSize] = TYPE();
+            return true;
+        }
+
+        return false;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr bool RewindableFixedVector<TYPE, SIZE>::empty() const
+    {
+        return m_rewindableSize.Get() == 0;
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr const TYPE& RewindableFixedVector<TYPE, SIZE>::back() const
+    {
+        AZ_Assert(size() > 0, "Attempted to get back element of an empty RewindableFixedVector");
+        return m_container[m_rewindableSize - 1].Get();
+    }
+
+    template <typename TYPE, uint32_t SIZE>
+    constexpr uint32_t RewindableFixedVector<TYPE, SIZE>::size() const
+    {
+        return m_rewindableSize;
+    }
+}
diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
index d5b7d563ab..f7e92bbe26 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/NetworkTime/RewindableObject.h
@@ -32,7 +32,7 @@ namespace Multiplayer
         RewindableObject() = default;
 
         //! Constructor.
-        //! @param connectionId the connectionId of the connection that owns the object.
+        //! @param value base type value to construct from
         RewindableObject(const BASE_TYPE& value);
 
         //! Copy construct from underlying base type.
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
index 71e81b6bfb..8cf1eeeb58 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja
@@ -7,13 +7,21 @@
 {% macro DeclareNetworkPropertyGetter(Property) %}
 {% set PropertyName = UpperFirst(Property.attrib['Name']) %}
 {%     if Property.attrib['Container'] == 'Array' %}
-const AZStd::array<{% if Property.attrib['IsRewindable']|booleanTrue %}Multiplayer::RewindableObject<{% endif %}{{ Property.attrib['Type'] }}{% if Property.attrib['IsRewindable']|booleanTrue %}, Multiplayer::k_RewindHistorySize>{% endif %}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const;
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const;
+{% else %}
+const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const;
+{% endif %}
 const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const;
 {%          if Property.attrib['GenerateEventBindings']|booleanTrue %}
 void {{ PropertyName }}AddEvent(AZ::Event<int32_t, {{ Property.attrib['Type'] }}>::Handler& handler);
 {%          endif %}
 {%     elif Property.attrib['Container'] == 'Vector' %}
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const;
+{% else %}
 const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const;
+{% endif %}
 const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const;
 const {{ Property.attrib['Type'] }} &{{ PropertyName }}GetBack() const;
 uint32_t {{ PropertyName }}GetSize() const;
@@ -156,9 +164,17 @@ AZ::Event<{{ Property.attrib['Type'] }}> m_{{ LowerFirst(Property.attrib['Name']
 {% macro DeclareNetworkPropertyVars(Component, ReplicateFrom, ReplicateTo) %}
 {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %}
 {%     if Property.attrib['Container'] == 'Array' %}
-AZStd::array<{% if Property.attrib['IsRewindable']|booleanTrue %}Multiplayer::RewindableObject<{% endif %}{{ Property.attrib['Type'] }}{% if Property.attrib['IsRewindable']|booleanTrue %}, Multiplayer::RewindHistorySize>{% endif %}, {{ Property.attrib['Count'] }}> m_{{ LowerFirst(Property.attrib['Name']) }};
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> m_{{ LowerFirst(Property.attrib['Name']) }};
+{% else %}
+AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> m_{{ LowerFirst(Property.attrib['Name']) }};
+{% endif %}
 {%     elif Property.attrib['Container'] == 'Vector' %}
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> m_{{ LowerFirst(Property.attrib['Name']) }};
+{% else %}
 AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> m_{{ LowerFirst(Property.attrib['Name']) }};
+{% endif %}
 {%     elif Property.attrib['IsRewindable']|booleanTrue %}
 Multiplayer::RewindableObject<{{ Property.attrib['Type'] }}, Multiplayer::RewindHistorySize> m_{{ LowerFirst(Property.attrib['Name']) }} = {{ Property.attrib['Init'] }};
 {%     else %}
@@ -228,6 +244,8 @@ AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }
 #include <Multiplayer/NetworkEntity/EntityReplication/ReplicationRecord.h>
 #include <Multiplayer/NetworkInput/IMultiplayerComponentInput.h>
 #include <Multiplayer/NetworkInput/NetworkInput.h>
+#include <Multiplayer/NetworkTime/RewindableArray.h>
+#include <Multiplayer/NetworkTime/RewindableFixedVector.h>
 #include <Multiplayer/NetworkTime/RewindableObject.h>
 {% call(Include) AutoComponentMacros.ParseIncludes(Component) %}
 #include <{{ Include.attrib['File'] }}>
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index 7d5295aabb..6b2c5b199a 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -3,7 +3,11 @@
 {% macro LowerFirst(text) %}{{ text[0] | lower}}{{ text[1:] }}{% endmacro %}
 {% macro DefineNetworkPropertyGet(ClassName, Property, Prefix = '') %}
 {%     if Property.attrib['Container'] == 'Array' %}
-const AZStd::array<{% if Property.attrib['IsRewindable']|booleanTrue %}Multiplayer::RewindableObject<{% endif %}{{ Property.attrib['Type'] }}{% if Property.attrib['IsRewindable']|booleanTrue %}, Multiplayer::RewindHistorySize>{% endif %}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
+{% else %}
+const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
+{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
@@ -21,7 +25,11 @@ void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}AddEvent(AZ::Even
 
 {%          endif %}
 {%     elif Property.attrib['Container'] == 'Vector' %}
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
+{% else %}
 const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
+{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
@@ -110,25 +118,26 @@ void {{ ClassName }}::Set{{ UpperFirst(Property.attrib['Name']) }}(int32_t index
 
 bool {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}PushBack(const {{ Property.attrib['Type'] }} &value)
 {
-    int32_t indexToSet = GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.size();
-    GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.push_back(value);
-    int32_t bitIndex = indexToSet + static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }});
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(bitIndex, true);
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
-    GetParent().MarkDirty();
-    return true;
+    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.push_back(value))
+    {
+        int32_t indexToSet = GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.size();
+        int32_t bitIndex = indexToSet + static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }});
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(bitIndex, true);
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
+        GetParent().MarkDirty();
+        return true;
+    }
 }
 
 bool {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}PopBack(const Multiplayer::NetworkInput&)
 {
-    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.empty())
+    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.pop_back())
     {
-        return false;
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
+        GetParent().MarkDirty();
+        return true;
     }
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
-    GetParent().MarkDirty();
-    GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.pop_back();
-    return true;
+    return false;
 }
 
 void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}Clear(const Multiplayer::NetworkInput&)
@@ -207,25 +216,27 @@ void {{ ClassName }}::Set{{ UpperFirst(Property.attrib['Name']) }}(int32_t index
 
 bool {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}PushBack(const {{ Property.attrib['Type'] }} &value)
 {
-    uint32_t indexToSet = aznumeric_cast<uint32_t>(GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.size());
-    GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.push_back(value);
-    uint32_t bitIndex = indexToSet + aznumeric_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }});
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(bitIndex, true);
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(aznumeric_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
-    GetParent().MarkDirty();
-    return true;
+    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.push_back(value))
+    {
+        uint32_t indexToSet = aznumeric_cast<uint32_t>(GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.size());
+        uint32_t bitIndex = indexToSet + aznumeric_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }});
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(bitIndex, true);
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(aznumeric_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
+        GetParent().MarkDirty();
+        return true;
+    }
+    return false;
 }
 
 bool {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}PopBack()
 {
-    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.empty())
+    if (GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.pop_back())
     {
-        return false;
+        GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
+        GetParent().MarkDirty();
+        return true;
     }
-    GetParent().m_currentRecord->m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.SetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }}), true);
-    GetParent().MarkDirty();
-    GetParent().m_{{ LowerFirst(Property.attrib['Name']) }}.pop_back();
-    return true;
+    return false;
 }
 
 void {{ ClassName }}::{{ UpperFirst(Property.attrib['Name']) }}Clear()
@@ -562,12 +573,12 @@ bool {{ ClassName }}::Serialize{{ AutoComponentMacros.GetNetPropertiesSetName(Re
 {%-      if networkPropertyCount.update({'value': networkPropertyCount.value + 1}) %}{% endif -%} 
 {% endcall %}
 {% if networkPropertyCount.value > 0 %}
-    Multiplayer::MultiplayerStats& stats = Multiplayer::GetMultiplayer()->GetStats();
+    [[maybe_unused]] Multiplayer::MultiplayerStats& stats = Multiplayer::GetMultiplayer()->GetStats();
     // We modify the record if we are writing an update so that we don't notify for a change that really didn't change the value (just a duplicated send from the server)
     [[maybe_unused]] bool modifyRecord = serializer.GetSerializerMode() == AzNetworking::SerializerMode::WriteToObject;
 {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %}
 {%     if Property.attrib['Container'] != 'None' and Property.attrib['Container'] != 'Object' %}
-    { /* @todo Implement serialization for Vector and Array Network Properties
+    { // Serialization for Vector and Array Network Properties
         const uint32_t firstBit = static_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }});
 {%         if Property.attrib['Container'] == 'Vector' %}
         const uint32_t lastBit = static_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }});
@@ -575,17 +586,8 @@ bool {{ ClassName }}::Serialize{{ AutoComponentMacros.GetNetPropertiesSetName(Re
         const uint32_t lastBit = static_cast<uint32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'End') }});
 {%         endif %}
         
-        AzNetworking::BitsetView deltaRecord(replicationRecord.m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}, firstBit, lastBit - firstBit + 1);
-        if (deltaRecord.AnySet())
-        {
-{%         if Property.attrib['Container'] == 'Vector' %}
-            Multiplayer::SerializableFixedSizeVectorDeltaStruct<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> deltaStruct(m_{{ LowerFirst(Property.attrib['Name']) }}, deltaRecord);
-{%         else %}
-            Multiplayer::SerializableFixedSizeArrayDeltaStruct<{% if Property.attrib['IsRewindable']|booleanTrue %}Multiplayer::RewindableObject<{% endif %}{{ Property.attrib['Type'] }}{% if Property.attrib['IsRewindable']|booleanTrue %}, Multiplayer::RewindHistorySize>{% endif %}, {{ Property.attrib['Count'] }}> deltaStruct(m_{{ Property.attrib['Name'] }}, deltaRecord);
-{%         endif %}
-            serializer.Serialize(deltaStruct, "{{ UpperFirst(Property.attrib['Name']) }}");
-        } 
-        */
+        AzNetworking::FixedSizeBitsetView deltaRecord(replicationRecord.m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}, firstBit, lastBit - firstBit + 1);
+        m_{{ LowerFirst(Property.attrib['Name']) }}.Serialize(serializer, deltaRecord);
     }
 {%     else %}
     Multiplayer::SerializeNetworkPropertyHelper
@@ -615,7 +617,7 @@ void {{ ClassName }}::NotifyChanges{{ AutoComponentMacros.GetNetPropertiesSetNam
 {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %}
 {% if (Property.attrib['GenerateEventBindings']|booleanTrue) %}
 {%     if Property.attrib['Container'] != 'None' and Property.attrib['Container'] != 'Object' %}
-    /* todo Implement NotifyChangesAuthorityToClientProperties for Arrays and Vectors
+    // NotifyChangesAuthorityToClientProperties for Arrays and Vectors
     for (uint32_t bitIndex = static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Start') }}), elementIndex = 0; bitIndex <= static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component, ReplicateFrom, ReplicateTo, Property, 'End') }}); ++bitIndex, ++elementIndex)
     {
         if (replicationRecord.m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.GetBit(bitIndex){% if Property.attrib['Container'] == 'Vector' %} && elementIndex < m_{{ Property.attrib['Name'] }}.GetSize(){% endif %})
@@ -627,7 +629,7 @@ void {{ ClassName }}::NotifyChanges{{ AutoComponentMacros.GetNetPropertiesSetNam
     if (replicationRecord.m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.GetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property, 'Size') }})))
     {
         m_{{ LowerFirst(Property.attrib['Name']) }}SizeChangedEvent.Signal(m_{{ LowerFirst(Property.attrib['Name']) }}.size());
-    } */
+    }
 {%         endif %}
 {%     else %}
     if (replicationRecord.m_{{ LowerFirst(AutoComponentMacros.GetNetPropertiesSetName(ReplicateFrom, ReplicateTo)) }}.GetBit(static_cast<int32_t>({{ AutoComponentMacros.GetNetPropertiesQualifiedPropertyDirtyEnum(Component.attrib['Name'], ReplicateFrom, ReplicateTo, Property) }})))
@@ -645,7 +647,11 @@ void {{ ClassName }}::NotifyChanges{{ AutoComponentMacros.GetNetPropertiesSetNam
 {% macro DefineArchetypePropertyGet(Property, ClassType, ClassName, Prefix = '') %}
 {% if ClassType == '' or Property.attrib['ExportTo'] == ClassType or Property.attrib['ExportTo'] == "Common" %}
 {%     if Property.attrib['Container'] == 'Array' %}
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
+{% else %}
 const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const
+{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
@@ -656,7 +662,11 @@ const {{ Property.attrib['Type'] }}& {{ ClassName }}::Get{{ UpperFirst(Property.
 }
 
 {%     elif Property.attrib['Container'] == 'Vector' %}
+{% if Property.attrib['IsRewindable']|booleanTrue %}
+const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
+{% else %}
 const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const
+{% endif %}
 {
     return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }};
 }
@@ -1472,7 +1482,14 @@ namespace {{ Component.attrib['Namespace'] }}
     {
 {% for Property in Component.iter('NetworkProperty') %}
 {%      if Property.attrib['IsRewindable']|booleanTrue %}
+{%         if Property.attrib['Container'] == 'Vector' or Property.attrib['Container'] == 'Array' %}
+        for ( auto& element: m_{{ LowerFirst(Property.attrib['Name']) }})
+        {
+            element.SetOwningConnectionId(connectionId);
+        }
+{% else %}
         m_{{ LowerFirst(Property.attrib['Name']) }}.SetOwningConnectionId(connectionId);
+{% endif %}
 {%      endif %}
 {% endfor %}
     }
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
index 96653a607c..a112cde4e6 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
+++ b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml
@@ -14,7 +14,7 @@
 
     <NetworkProperty Type="AZ::Quaternion" Name="rotation" Init="AZ::Quaternion::CreateIdentity()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
     <NetworkProperty Type="AZ::Vector3" Name="translation" Init="AZ::Vector3::CreateZero()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
-    <NetworkProperty Type="AZ::Vector3" Name="scale" Init="AZ::Vector3::CreateZero()" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
+    <NetworkProperty Type="float" Name="scale" Init="1.0f" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
     <NetworkProperty Type="uint8_t"     Name="resetCount" Init="0" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="false" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
     <NetworkProperty Type="NetEntityId" Name="parentEntityId" Init="InvalidNetEntityId" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
     <NetworkProperty Type="int32_t"     Name="parentAttachmentBoneId" Init="-1" ReplicateFrom="Authority" ReplicateTo="Client" IsRewindable="true" IsPredictable="true" IsPublic="true" Container="Object" ExposeToEditor="false" GenerateEventBindings="true" />
diff --git a/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
index 81b756de50..9a49724fb8 100644
--- a/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Components/NetworkTransformComponent.cpp
@@ -32,7 +32,7 @@ namespace Multiplayer
     NetworkTransformComponent::NetworkTransformComponent()
         : m_rotationEventHandler([this](const AZ::Quaternion& rotation) { OnRotationChangedEvent(rotation); })
         , m_translationEventHandler([this](const AZ::Vector3& translation) { OnTranslationChangedEvent(translation); })
-        , m_scaleEventHandler([this](const AZ::Vector3& scale) { OnScaleChangedEvent(scale); })
+        , m_scaleEventHandler([this](float scale) { OnScaleChangedEvent(scale); })
         , m_resetCountEventHandler([this](const uint8_t&) { OnResetCountChangedEvent(); })
         , m_entityPreRenderEventHandler([this](float deltaTime, float blendFactor) { OnPreRender(deltaTime, blendFactor); })
     {
@@ -73,10 +73,10 @@ namespace Multiplayer
         m_targetTransform.SetTranslation(translation);
     }
 
-    void NetworkTransformComponent::OnScaleChangedEvent(const AZ::Vector3& scale)
+    void NetworkTransformComponent::OnScaleChangedEvent(float scale)
     {
-        m_previousTransform.SetScale(m_targetTransform.GetScale());
-        m_targetTransform.SetScale(scale);
+        m_previousTransform.SetUniformScale(m_targetTransform.GetUniformScale());
+        m_targetTransform.SetUniformScale(scale);
     }
 
     void NetworkTransformComponent::OnResetCountChangedEvent()
@@ -119,6 +119,6 @@ namespace Multiplayer
     {
         SetRotation(worldTm.GetRotation());
         SetTranslation(worldTm.GetTranslation());
-        SetScale(worldTm.GetScale());
+        SetScale(worldTm.GetUniformScale());
     }
 }
diff --git a/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
new file mode 100644
index 0000000000..0653dd5e08
--- /dev/null
+++ b/Gems/Multiplayer/Code/Tests/RewindableContainerTests.cpp
@@ -0,0 +1,121 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <Multiplayer/IMultiplayer.h>
+#include <Multiplayer/NetworkTime/RewindableArray.h>
+#include <Multiplayer/NetworkTime/RewindableFixedVector.h>
+#include <Multiplayer/NetworkTime/RewindableObject.h>
+#include <Source/NetworkTime/NetworkTime.h>
+#include <AzCore/Console/LoggerSystemComponent.h>
+#include <AzCore/Time/TimeSystemComponent.h>
+#include <AzCore/UnitTest/TestTypes.h>
+
+namespace UnitTest
+{
+    class RewindableContainerTests
+        : public AllocatorsFixture
+    {
+    public:
+        Multiplayer::NetworkTime m_networkTime;
+        AZ::LoggerSystemComponent m_loggerComponent;
+        AZ::TimeSystemComponent m_timeComponent;
+    };
+
+    static constexpr uint32_t RewindableContainerSize = 7;
+
+    TEST_F(RewindableContainerTests, BasicVectorTest)
+    {
+        Multiplayer::RewindableFixedVector<uint32_t, RewindableContainerSize> test(0, 0);
+
+        // Test push_back
+        for (uint32_t idx = 0; idx < RewindableContainerSize; ++idx)
+        {
+            test.push_back(idx);
+            EXPECT_EQ(idx, test[idx]);
+            Multiplayer::GetNetworkTime()->IncrementHostFrameId();
+        }
+
+        // Test rewind for all pushed values and overall size
+        for (uint32_t idx = 0; idx < RewindableContainerSize; ++idx)
+        {
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(idx), AZ::TimeMs{ 0 }, AzNetworking::InvalidConnectionId);
+            EXPECT_EQ(idx + 1, test.size());
+            EXPECT_EQ(idx, test.back());
+        }
+
+        // Test pop_back
+        test.pop_back();
+        EXPECT_EQ(RewindableContainerSize - 1, test.size());
+        Multiplayer::GetNetworkTime()->IncrementHostFrameId();
+
+        // Test iterator
+        uint32_t iterCount = 0;
+        auto iter = test.begin();
+        while (iter != test.end())
+        {
+            ++iterCount;
+            ++iter;
+        }
+        EXPECT_EQ(RewindableContainerSize - 1, iterCount);
+
+        // Test clear and empty
+        test.clear();
+        EXPECT_EQ(0, test.size());
+        Multiplayer::GetNetworkTime()->IncrementHostFrameId();
+        EXPECT_TRUE(test.empty());
+
+        // Test rewind for pop_back and clear
+        Multiplayer::ScopedAlterTime pop_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize), AZ::TimeMs{ 0 }, AzNetworking::InvalidConnectionId);
+        EXPECT_EQ(RewindableContainerSize - 1, test.size());
+        Multiplayer::ScopedAlterTime clear_time(static_cast<Multiplayer::HostFrameId>(RewindableContainerSize + 1), AZ::TimeMs{ 0 }, AzNetworking::InvalidConnectionId);
+        EXPECT_EQ(0, test.size());
+
+        // Test copy_values and resize_no_construct
+        test.resize_no_construct(RewindableContainerSize);
+        test.copy_values(&test[RewindableContainerSize-1], 1);
+        EXPECT_EQ(1, test.size());
+        test.resize_no_construct(RewindableContainerSize);
+        EXPECT_EQ(test[0], test[RewindableContainerSize - 1]);
+    }
+
+    TEST_F(RewindableContainerTests, BasicArrayTest)
+    {
+        Multiplayer::RewindableArray<uint32_t, RewindableContainerSize> test;
+
+        test.fill(0);
+        Multiplayer::GetNetworkTime()->IncrementHostFrameId();
+        // Test push_back
+        for (uint32_t idx = 0; idx < RewindableContainerSize; ++idx)
+        {
+            test[idx] = idx;
+            EXPECT_EQ(idx, test[idx].Get());
+            Multiplayer::GetNetworkTime()->IncrementHostFrameId();
+        }
+
+        // Test rewind for all values and overall size
+        for (uint32_t idx = 1; idx <= RewindableContainerSize; ++idx)
+        {
+            Multiplayer::ScopedAlterTime time(static_cast<Multiplayer::HostFrameId>(idx), AZ::TimeMs{ 0 }, AzNetworking::InvalidConnectionId);
+            for (uint32_t testIdx = 0; testIdx < RewindableContainerSize; ++testIdx)
+            {
+                if (testIdx < idx)
+                {
+                    EXPECT_EQ(testIdx, test[testIdx].Get());
+                }
+                else
+                {
+                    EXPECT_EQ(0, test[testIdx].Get());
+                }
+            }
+        }
+    }
+}
diff --git a/Gems/Multiplayer/Code/multiplayer_files.cmake b/Gems/Multiplayer/Code/multiplayer_files.cmake
index eb856a48db..1cfef93240 100644
--- a/Gems/Multiplayer/Code/multiplayer_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_files.cmake
@@ -33,6 +33,10 @@ set(FILES
     Include/Multiplayer/NetworkInput/IMultiplayerComponentInput.h
     Include/Multiplayer/NetworkInput/NetworkInput.h
     Include/Multiplayer/NetworkTime/INetworkTime.h
+    Include/Multiplayer/NetworkTime/RewindableArray.h
+    Include/Multiplayer/NetworkTime/RewindableArray.inl
+    Include/Multiplayer/NetworkTime/RewindableFixedVector.h
+    Include/Multiplayer/NetworkTime/RewindableFixedVector.inl
     Include/Multiplayer/NetworkTime/RewindableObject.h
     Include/Multiplayer/NetworkTime/RewindableObject.inl
     Include/Multiplayer/ReplicationWindows/IReplicationWindow.h
diff --git a/Gems/Multiplayer/Code/multiplayer_tests_files.cmake b/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
index fe1ca38186..0731c25d3b 100644
--- a/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_tests_files.cmake
@@ -13,5 +13,6 @@ set(FILES
     Tests/Main.cpp
     Tests/IMultiplayerConnectionMock.h
     Tests/MultiplayerSystemTests.cpp
+    Tests/RewindableContainerTests.cpp
     Tests/RewindableObjectTests.cpp
 )
diff --git a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings
index dd621c891f..adbf7d20f9 100644
--- a/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings
+++ b/Gems/NvCloth/Assets/Objects/cloth/Chicken/Actor/chicken_diff.png.imagesettings
@@ -17,7 +17,7 @@
 		<Class name="unsigned int" field="MipMapGenType" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}"/>
@@ -36,7 +36,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/anodized_metal_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/anodized_metal_diff.tif.exportsettings
index 8d01ab1ac2..e97c4e452c 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/anodized_metal_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/anodized_metal_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:0,ios:0,osx_gl:0,pc:2,provo:0,wiiu:0"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:0,ios:0,mac:0,pc:2,provo:0,wiiu:0"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/brushed_steel_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/brushed_steel_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/brushed_steel_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/brushed_steel_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/dark_leather_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/dark_leather_diff.tif.exportsettings
index 2a29854fae..19e899701a 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/dark_leather_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/dark_leather_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/galvanized_steel_spec.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/galvanized_steel_spec.tif.exportsettings
index 93bcddc494..08861692ea 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/galvanized_steel_spec.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/galvanized_steel_spec.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Reflectance /reduce="es3:0,ios:0,osx_gl:0,pc:1,provo:0,wiiu:0"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Reflectance /reduce="android:0,ios:0,mac:0,pc:1,provo:0,wiiu:0"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/leather_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/leather_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/leather_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/leather_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/light_leather_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/light_leather_diff.tif.exportsettings
index 2a29854fae..19e899701a 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/light_leather_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/light_leather_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_diff.tif.exportsettings
index 2a29854fae..19e899701a 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/mixed_stones_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/red_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/red_diff.tif.exportsettings
index 54586c2db1..48c18e1fe4 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/red_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/red_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:0,ios:0,osx_gl:0,pc:3,provo:0,wiiu:0"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:0,ios:0,mac:0,pc:3,provo:0,wiiu:0"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rotary_brushed_steel_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rotary_brushed_steel_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rotary_brushed_steel_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rotary_brushed_steel_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_diff.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_diff.tif.exportsettings
index 2a29854fae..19e899701a 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_diff.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/rust_diff.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=Albedo /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/wood_planks_ddna.tif.exportsettings b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/wood_planks_ddna.tif.exportsettings
index f1f2f06410..a098bdcad9 100644
--- a/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/wood_planks_ddna.tif.exportsettings
+++ b/Gems/PBSreferenceMaterials/Assets/materials/pbs_reference/wood_planks_ddna.tif.exportsettings
@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:1,pc:0,provo:1,wiiu:1"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:1,pc:0,provo:1,wiiu:1"
diff --git a/Gems/PhysX/Code/Editor/DebugDraw.cpp b/Gems/PhysX/Code/Editor/DebugDraw.cpp
index fffb1e1350..23a9a3cb44 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.cpp
+++ b/Gems/PhysX/Code/Editor/DebugDraw.cpp
@@ -555,25 +555,37 @@ namespace PhysX
 
             if (meshConfig.GetCachedNativeMesh())
             {
-                const AZ::Transform scaleMatrix = AZ::Transform::CreateScale(meshScale);
-                debugDisplay.PushMatrix(GetColliderLocalTransform(colliderConfig) * scaleMatrix);
+                debugDisplay.PushMatrix(GetColliderLocalTransform(colliderConfig));
 
                 if (meshConfig.GetMeshType() == Physics::CookedMeshShapeConfiguration::MeshType::TriangleMesh)
                 {
-                    DrawTriangleMesh(debugDisplay, colliderConfig, geomIndex);
+                    DrawTriangleMesh(debugDisplay, colliderConfig, geomIndex, meshScale);
                 }
                 else
                 {
-                    DrawConvexMesh(debugDisplay, colliderConfig, geomIndex);
+                    DrawConvexMesh(debugDisplay, colliderConfig, geomIndex, meshScale);
                 }
 
                 debugDisplay.PopMatrix();
             }
         }
 
-        void Collider::DrawTriangleMesh(AzFramework::DebugDisplayRequests& debugDisplay,
-            const Physics::ColliderConfiguration& colliderConfig,
-            AZ::u32 geomIndex) const
+        AZStd::vector<AZ::Vector3> ScalePoints(const AZ::Vector3& scale, const AZStd::vector<AZ::Vector3>& points)
+        {
+            AZStd::vector<AZ::Vector3> scaledPoints;
+            scaledPoints.resize_no_construct(points.size());
+            AZStd::transform(
+                points.begin(), points.end(), scaledPoints.begin(),
+                [scale](const AZ::Vector3& point)
+                {
+                    return scale * point;
+                });
+            return scaledPoints;
+        }
+
+        void Collider::DrawTriangleMesh(
+            AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
+            const AZ::Vector3& meshScale) const
         {
             AZ_Assert(geomIndex < m_geometry.size(), "DrawTriangleMesh: geomIndex is out of range");
 
@@ -581,10 +593,10 @@ namespace PhysX
 
             const AZStd::unordered_map<int, AZStd::vector<AZ::u32>>& triangleIndexesByMaterialSlot
                 = geom.m_triangleIndexesByMaterialSlot;
-            const AZStd::vector<AZ::Vector3>& verts = geom.m_verts;
-            const AZStd::vector<AZ::Vector3>& points = geom.m_points;
+            AZStd::vector<AZ::Vector3> scaledVerts = ScalePoints(meshScale, geom.m_verts);
+            AZStd::vector<AZ::Vector3> scaledPoints = ScalePoints(meshScale, geom.m_points);
 
-            if (!verts.empty())
+            if (!scaledVerts.empty())
             {
                 for (const auto& element : triangleIndexesByMaterialSlot)
                 {
@@ -596,30 +608,31 @@ namespace PhysX
                     triangleMeshInfo.m_numTriangles = triangleCount;
                     triangleMeshInfo.m_materialSlotIndex = materialSlot;
 
-                    debugDisplay.DrawTrianglesIndexed(verts, triangleIndexes
+                    debugDisplay.DrawTrianglesIndexed(scaledVerts, triangleIndexes
                         , CalcDebugColor(colliderConfig, triangleMeshInfo));
                 }
-                debugDisplay.DrawLines(points, WireframeColor);
+                debugDisplay.DrawLines(scaledPoints, WireframeColor);
             }
         }
 
-        void Collider::DrawConvexMesh(AzFramework::DebugDisplayRequests& debugDisplay,
-            const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex) const
+        void Collider::DrawConvexMesh(
+            AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
+            const AZ::Vector3& meshScale) const
         {
             AZ_Assert(geomIndex < m_geometry.size(), "DrawConvexMesh: geomIndex is out of range");
 
             const GeometryData& geom = m_geometry[geomIndex];
-            const AZStd::vector<AZ::Vector3>& verts = geom.m_verts;
-            const AZStd::vector<AZ::Vector3>& points = geom.m_points;
+            AZStd::vector<AZ::Vector3> scaledVerts = ScalePoints(meshScale, geom.m_verts);
+            AZStd::vector<AZ::Vector3> scaledPoints = ScalePoints(meshScale, geom.m_points);
 
-            if (!verts.empty())
+            if (!scaledVerts.empty())
             {
-                const AZ::u32 triangleCount = static_cast<AZ::u32>(verts.size() / 3);
+                const AZ::u32 triangleCount = static_cast<AZ::u32>(scaledVerts.size() / 3);
                 ElementDebugInfo convexMeshInfo;
                 convexMeshInfo.m_numTriangles = triangleCount;
 
-                debugDisplay.DrawTriangles(verts, CalcDebugColor(colliderConfig, convexMeshInfo));
-                debugDisplay.DrawLines(points, WireframeColor);
+                debugDisplay.DrawTriangles(scaledVerts, CalcDebugColor(colliderConfig, convexMeshInfo));
+                debugDisplay.DrawLines(scaledPoints, WireframeColor);
             }
         }
 
@@ -685,7 +698,7 @@ namespace PhysX
             // Let each collider decide how to scale itself, so extract the scale here.
             AZ::Transform entityWorldTransformWithoutScale = AZ::Transform::CreateIdentity();
             AZ::TransformBus::EventResult(entityWorldTransformWithoutScale, m_entityId, &AZ::TransformInterface::GetWorldTM);
-            entityWorldTransformWithoutScale.ExtractScale();
+            entityWorldTransformWithoutScale.ExtractUniformScale();
 
             auto* physXDebug = AZ::Interface<Debug::PhysXDebugInterface>::Get();
             if (physXDebug == nullptr)
diff --git a/Gems/PhysX/Code/Editor/DebugDraw.h b/Gems/PhysX/Code/Editor/DebugDraw.h
index fcff961412..c43634717a 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.h
+++ b/Gems/PhysX/Code/Editor/DebugDraw.h
@@ -115,11 +115,13 @@ namespace PhysX
                 AzFramework::DebugDisplayRequests& debugDisplay) override;
 
             // Internal mesh drawing subroutines 
-            void DrawTriangleMesh(AzFramework::DebugDisplayRequests& debugDisplay,
-                const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex) const;
+            void DrawTriangleMesh(
+                AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
+                const AZ::Vector3& meshScale = AZ::Vector3::CreateOne()) const;
 
-            void DrawConvexMesh(AzFramework::DebugDisplayRequests& debugDisplay,
-                const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex) const;
+            void DrawConvexMesh(
+                AzFramework::DebugDisplayRequests& debugDisplay, const Physics::ColliderConfiguration& colliderConfig, AZ::u32 geomIndex,
+                const AZ::Vector3& meshScale = AZ::Vector3::CreateOne()) const;
 
             void BuildTriangleMesh(physx::PxBase* meshData, AZ::u32 geomIndex) const;
 
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
index 502d60d8d9..e8e93e0d6e 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
@@ -89,7 +89,7 @@ namespace PhysX
             AZ::Transform worldTransform = AZ::Transform::CreateIdentity();
             AZ::TransformBus::EventResult(
                 worldTransform, m_entityComponentId.GetEntityId(), &AZ::TransformInterface::GetWorldTM);
-            worldTransform.ExtractScale();
+            worldTransform.ExtractUniformScale();
 
             AZ::Transform localTransform = AZ::Transform::CreateIdentity();
             EditorJointRequestBus::EventResult(
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index e9b9c41da3..87bb702184 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -603,7 +603,7 @@ namespace PhysX
         }
 
         AZ::Transform colliderTransform = GetWorldTM();
-        colliderTransform.ExtractScale();
+        colliderTransform.ExtractUniformScale();
         AzPhysics::StaticRigidBodyConfiguration configuration;
         configuration.m_orientation = colliderTransform.GetRotation();
         configuration.m_position = colliderTransform.GetTranslation();
@@ -868,7 +868,7 @@ namespace PhysX
             colliderConfigNoOffset.m_rotation = AZ::Quaternion::CreateIdentity();
             colliderConfigNoOffset.m_position = AZ::Vector3::CreateZero();
             m_colliderDebugDraw.DrawMesh(debugDisplay, colliderConfigNoOffset, m_scaledPrimitive.value(),
-                GetWorldTM().GetScale() * m_cachedNonUniformScale, shapeIndex);
+                GetWorldTM().GetUniformScale() * m_cachedNonUniformScale, shapeIndex);
         }
     }
 
@@ -1007,7 +1007,7 @@ namespace PhysX
 
     AZ::Vector3 EditorColliderComponent::GetBoxScale()
     {
-        return GetWorldTM().GetScale();
+        return AZ::Vector3(GetWorldTM().GetUniformScale());
     }
 
     void EditorColliderComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
@@ -1049,7 +1049,7 @@ namespace PhysX
     void EditorColliderComponent::UpdateShapeConfigurationScale()
     {
         auto& shapeConfiguration = m_shapeConfiguration.GetCurrent();
-        shapeConfiguration.m_scale = GetWorldTM().ExtractScale() * m_cachedNonUniformScale;
+        shapeConfiguration.m_scale = GetWorldTM().ExtractUniformScale() * m_cachedNonUniformScale;
         m_colliderDebugDraw.ClearCachedGeometry();
     }
 
diff --git a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
index efd65181da..f68c4d17d8 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
@@ -365,7 +365,7 @@ namespace PhysX
         }
         
         AZ::Transform colliderTransform = GetWorldTM();
-        colliderTransform.ExtractScale();
+        colliderTransform.ExtractUniformScale();
 
         AzPhysics::RigidBodyConfiguration configuration = m_config;
         configuration.m_orientation = colliderTransform.GetRotation();
diff --git a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
index 379afc3f2d..692fbf96f3 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
@@ -205,7 +205,7 @@ namespace PhysX
         }
 
         AZ::Transform transform = GetWorldTM();
-        transform.ExtractScale();
+        transform.ExtractUniformScale();
         const size_t numPoints = m_geometryCache.m_cachedSamplePoints.size();
         for (size_t pointIndex = 0; pointIndex < numPoints; ++pointIndex)
         {
diff --git a/Gems/PhysX/Code/Source/ForceRegion.cpp b/Gems/PhysX/Code/Source/ForceRegion.cpp
index c41ae47a0e..2cdd0dea3f 100644
--- a/Gems/PhysX/Code/Source/ForceRegion.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegion.cpp
@@ -148,7 +148,7 @@ namespace PhysX
     {
         m_worldTransform = world;
         m_regionParams.m_position = world.GetTranslation();
-        m_regionParams.m_scale = world.GetScale();
+        m_regionParams.m_scale = world.GetUniformScale();
         m_regionParams.m_rotation = world.GetRotation();
         AZ::EBusReduceResult<AZ::Aabb, PhysX::TriggerAabbAggregator> triggerAabb;
         triggerAabb.value = AZ::Aabb::CreateNull();
@@ -223,7 +223,7 @@ namespace PhysX
             , entityId
             , &AZ::TransformBus::Events::GetWorldTM);
         regionParams.m_position = worldTransform.GetTranslation();
-        regionParams.m_scale = worldTransform.GetScale();
+        regionParams.m_scale = worldTransform.GetUniformScale();
         regionParams.m_rotation = worldTransform.GetRotation();
 
         LmbrCentral::SplineComponentRequestBus::EventResult(regionParams.m_spline
diff --git a/Gems/PhysX/Code/Source/ForceRegionForces.cpp b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
index 8ea74c0de7..61679e9cb4 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
@@ -294,8 +294,7 @@ namespace PhysX
                 rotateInverse.InvertFull();
             }
 
-            AZ::Vector3 scaleInverse = region.m_scale;
-            scaleInverse = scaleInverse.GetReciprocal();
+            float scaleInverse = 1.0f / region.m_scale;
 
             AZ::Vector3 position = entity.m_position + entity.m_velocity * m_lookAhead;
             AZ::Vector3 localPos = position - region.m_position;
diff --git a/Gems/PhysX/Code/Source/ForceRegionForces.h b/Gems/PhysX/Code/Source/ForceRegionForces.h
index 206e35c195..6f7eb6b277 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.h
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.h
@@ -36,7 +36,7 @@ namespace PhysX
         AZ::EntityId m_id;
         AZ::Vector3 m_position;
         AZ::Quaternion m_rotation;
-        AZ::Vector3 m_scale;
+        float m_scale;
         AZ::SplinePtr m_spline;
         AZ::Aabb m_aabb;
     };
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
index 5249781e31..02ebe7281c 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
@@ -274,7 +274,7 @@ namespace PhysX
         m_queuedDisableSimulation = true;
     }
 
-    bool Ragdoll::IsSimulated()
+    bool Ragdoll::IsSimulated() const
     {
         return m_simulating;
     }
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
index 7bf807bcc5..7182a3a44c 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h
@@ -46,7 +46,7 @@ namespace PhysX
         void EnableSimulationQueued(const Physics::RagdollState& initialState) override;
         void DisableSimulation() override;
         void DisableSimulationQueued() override;
-        bool IsSimulated() override;
+        bool IsSimulated() const override;
         void GetState(Physics::RagdollState& ragdollState) const override;
         void SetState(const Physics::RagdollState& ragdollState) override;
         void SetStateQueued(const Physics::RagdollState& ragdollState) override;
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
index 6fa69c7a24..86c60565a0 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
@@ -105,39 +105,55 @@ namespace PhysX
 
     AZ::Vector3 CharacterControllerComponent::GetBasePosition() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetBasePosition() : AZ::Vector3::CreateZero();
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetBasePosition();
+        }
+        return AZ::Vector3::CreateZero();
     }
 
     void CharacterControllerComponent::SetBasePosition(const AZ::Vector3& position)
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            m_controller->SetBasePosition(position);
+            controller->SetBasePosition(position);
             AZ::TransformBus::Event(GetEntityId(), &AZ::TransformBus::Events::SetWorldTranslation, position);
         }
     }
 
     AZ::Vector3 CharacterControllerComponent::GetCenterPosition() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetCenterPosition() : AZ::Vector3::CreateZero();
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetCenterPosition();
+        }
+        return AZ::Vector3::CreateZero();
     }
 
     float CharacterControllerComponent::GetStepHeight() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetStepHeight() : 0.0f;
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetStepHeight();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetStepHeight(float stepHeight)
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            m_controller->SetStepHeight(stepHeight);
+            controller->SetStepHeight(stepHeight);
         }
     }
 
     AZ::Vector3 CharacterControllerComponent::GetUpDirection() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetUpDirection() : AZ::Vector3::CreateZero();
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetUpDirection();
+        }
+        return AZ::Vector3::CreateZero();
     }
 
     void CharacterControllerComponent::SetUpDirection([[maybe_unused]] const AZ::Vector3& upDirection)
@@ -147,51 +163,58 @@ namespace PhysX
 
     float CharacterControllerComponent::GetSlopeLimitDegrees() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetSlopeLimitDegrees() : 0.0f;
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetSlopeLimitDegrees();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetSlopeLimitDegrees(float slopeLimitDegrees)
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            m_controller->SetSlopeLimitDegrees(slopeLimitDegrees);
+            controller->SetSlopeLimitDegrees(slopeLimitDegrees);
         }
     }
 
     float CharacterControllerComponent::GetMaximumSpeed() const
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetControllerConst())
         {
-            return m_controller->GetMaximumSpeed();
+            return controller->GetMaximumSpeed();
         }
-
         return 0.0f;
     }
 
     void CharacterControllerComponent::SetMaximumSpeed(float maximumSpeed)
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            m_controller->SetMaximumSpeed(maximumSpeed);
+            controller->SetMaximumSpeed(maximumSpeed);
         }
     }
 
     AZ::Vector3 CharacterControllerComponent::GetVelocity() const
     {
-        return IsPhysicsEnabled() ? m_controller->GetVelocity() : AZ::Vector3::CreateZero();
+        if (auto* controller = GetControllerConst())
+        {
+            return controller->GetVelocity();
+        }
+        return AZ::Vector3::CreateZero();
     }
 
     void CharacterControllerComponent::AddVelocity(const AZ::Vector3& velocity)
     {
-        if (IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            m_controller->AddVelocity(velocity);
+            controller->AddVelocity(velocity);
         }
     }
 
     Physics::Character* CharacterControllerComponent::GetCharacter()
     {
-        return m_controller;
+        return GetController();
     }
 
     void CharacterControllerComponent::EnablePhysics()
@@ -206,14 +229,14 @@ namespace PhysX
 
     bool CharacterControllerComponent::IsPhysicsEnabled() const
     {
-        return m_controller != nullptr;
+        return GetControllerConst() != nullptr;
     }
 
     AZ::Aabb CharacterControllerComponent::GetAabb() const
     {
-        if (m_controller)
+        if (auto* controller = GetControllerConst())
         {
-            return m_controller->GetAabb();
+            return controller->GetAabb();
         }
         return AZ::Aabb::CreateNull();
     }
@@ -225,94 +248,121 @@ namespace PhysX
 
     AzPhysics::SimulatedBodyHandle CharacterControllerComponent::GetSimulatedBodyHandle() const
     {
-        if (m_controller)
-        {
-            return m_controller->m_bodyHandle;
-        }
-        return AzPhysics::InvalidSimulatedBodyHandle;
+        return m_controllerBodyHandle;
     }
 
     AzPhysics::SceneQueryHit CharacterControllerComponent::RayCast(const AzPhysics::RayCastRequest& request)
     {
-        if (m_controller)
+        if (auto* controller = GetController())
         {
-            return m_controller->RayCast(request);
+            return controller->RayCast(request);
         }
+
         return AzPhysics::SceneQueryHit();
     }
 
     // CharacterControllerRequestBus
     void CharacterControllerComponent::Resize(float height)
     {
-        return m_controller->Resize(height);
+        if (auto* controller = GetController())
+        {
+            controller->Resize(height);
+        }
     }
 
     float CharacterControllerComponent::GetHeight()
     {
-        return m_controller->GetHeight();
+        if (auto* controller = GetController())
+        {
+            return controller->GetHeight();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetHeight(float height)
     {
-        return m_controller->SetHeight(height);
+        if (auto* controller = GetController())
+        {
+            controller->SetHeight(height);
+        }
     }
 
     float CharacterControllerComponent::GetRadius()
     {
-        return m_controller->GetRadius();
+        if (auto* controller = GetController())
+        {
+            return controller->GetRadius();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetRadius(float radius)
     {
-        return m_controller->SetRadius(radius);
+        if (auto* controller = GetController())
+        {
+            controller->SetRadius(radius);
+        }
     }
 
     float CharacterControllerComponent::GetHalfSideExtent()
     {
-        return m_controller->GetHalfSideExtent();
+        if (auto* controller = GetController())
+        {
+            return controller->GetHalfSideExtent();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetHalfSideExtent(float halfSideExtent)
     {
-        return m_controller->SetHalfSideExtent(halfSideExtent);
+        if (auto* controller = GetController())
+        {
+            controller->SetHalfSideExtent(halfSideExtent);
+        }
     }
 
     float CharacterControllerComponent::GetHalfForwardExtent()
     {
-        return m_controller->GetHalfForwardExtent();
+        if (auto* controller = GetController())
+        {
+            return controller->GetHalfForwardExtent();
+        }
+        return 0.0f;
     }
 
     void CharacterControllerComponent::SetHalfForwardExtent(float halfForwardExtent)
     {
-        return m_controller->SetHalfForwardExtent(halfForwardExtent);
+        if (auto* controller = GetController())
+        {
+            controller->SetHalfForwardExtent(halfForwardExtent);
+        }
     }
 
     // TransformNotificationBus
     void CharacterControllerComponent::OnTransformChanged(const AZ::Transform& /*local*/, const AZ::Transform& world)
     {
-        if (!IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            return;
+            controller->SetBasePosition(world.GetTranslation());
         }
-
-        m_controller->SetBasePosition(world.GetTranslation());
     }
     
     void CharacterControllerComponent::SetCollisionLayer(const AZStd::string& layerName, AZ::Crc32 colliderTag)
     {
-        if (!IsPhysicsEnabled())
+        auto* controller = GetController();
+        if (controller == nullptr)
         {
             return;
         }
 
-        if (Physics::Utils::FilterTag(m_controller->GetColliderTag(), colliderTag))
+        if (Physics::Utils::FilterTag(controller->GetColliderTag(), colliderTag))
         {
             bool success = false;
             AzPhysics::CollisionLayer collisionLayer;
             Physics::CollisionRequestBus::BroadcastResult(success, &Physics::CollisionRequests::TryGetCollisionLayerByName, layerName, collisionLayer);
             if (success) 
             {
-                m_controller->SetCollisionLayer(collisionLayer);
+                controller->SetCollisionLayer(collisionLayer);
             }
         }
     }
@@ -320,30 +370,33 @@ namespace PhysX
     AZStd::string CharacterControllerComponent::GetCollisionLayerName()
     {
         AZStd::string layerName;
-        if (!IsPhysicsEnabled())
+        auto* controller = GetControllerConst();
+        if (controller == nullptr)
         {
             return layerName;
         }
 
-        Physics::CollisionRequestBus::BroadcastResult(layerName, &Physics::CollisionRequests::GetCollisionLayerName, m_controller->GetCollisionLayer());
+        Physics::CollisionRequestBus::BroadcastResult(
+            layerName, &Physics::CollisionRequests::GetCollisionLayerName, controller->GetCollisionLayer());
         return layerName;
     }
 
     void CharacterControllerComponent::SetCollisionGroup(const AZStd::string& groupName, AZ::Crc32 colliderTag)
     {
-        if (!IsPhysicsEnabled())
+        auto* controller = GetController();
+        if (controller == nullptr)
         {
             return;
         }
 
-        if (Physics::Utils::FilterTag(m_controller->GetColliderTag(), colliderTag))
+        if (Physics::Utils::FilterTag(controller->GetColliderTag(), colliderTag))
         {
             bool success = false;
             AzPhysics::CollisionGroup collisionGroup;
             Physics::CollisionRequestBus::BroadcastResult(success, &Physics::CollisionRequests::TryGetCollisionGroupByName, groupName, collisionGroup);
             if (success)
             {
-                m_controller->SetCollisionGroup(collisionGroup);
+                controller->SetCollisionGroup(collisionGroup);
             }
         }
     }
@@ -351,23 +404,26 @@ namespace PhysX
     AZStd::string CharacterControllerComponent::GetCollisionGroupName()
     {
         AZStd::string groupName;
-        if (!IsPhysicsEnabled())
+        auto* controller = GetControllerConst();
+        if (controller == nullptr)
         {
             return groupName;
         }
-        
-        Physics::CollisionRequestBus::BroadcastResult(groupName, &Physics::CollisionRequests::GetCollisionGroupName, m_controller->GetCollisionGroup());
+
+        Physics::CollisionRequestBus::BroadcastResult(
+            groupName, &Physics::CollisionRequests::GetCollisionGroupName, controller->GetCollisionGroup());
         return groupName;
     }
 
     void CharacterControllerComponent::ToggleCollisionLayer(const AZStd::string& layerName, AZ::Crc32 colliderTag, bool enabled)
     {
-        if (!IsPhysicsEnabled())
+        auto* controller = GetController();
+        if (controller == nullptr)
         {
             return;
         }
 
-        if (Physics::Utils::FilterTag(m_controller->GetColliderTag(), colliderTag))
+        if (Physics::Utils::FilterTag(controller->GetColliderTag(), colliderTag))
         {
             bool success = false;
             AzPhysics::CollisionLayer collisionLayer;
@@ -375,23 +431,43 @@ namespace PhysX
             if (success)
             {
                 AzPhysics::CollisionLayer layer(layerName);
-                AzPhysics::CollisionGroup group = m_controller->GetCollisionGroup();
+                AzPhysics::CollisionGroup group = controller->GetCollisionGroup();
                 group.SetLayer(layer, enabled);
-                m_controller->SetCollisionGroup(group);
+                controller->SetCollisionGroup(group);
             }
         }
     }
 
     void CharacterControllerComponent::OnPreSimulate(float deltaTime)
     {
-        if (m_controller)
+        if (auto* controller = GetController())
         {
-            m_controller->ApplyRequestedVelocity(deltaTime);
-            const AZ::Vector3 newPosition = GetBasePosition();
+            controller->ApplyRequestedVelocity(deltaTime);
+            const AZ::Vector3 newPosition = controller->GetBasePosition();
             AZ::TransformBus::Event(GetEntityId(), &AZ::TransformBus::Events::SetWorldTranslation, newPosition);
         }
     }
 
+    const PhysX::CharacterController* CharacterControllerComponent::GetControllerConst() const
+    {
+        if (m_controllerBodyHandle == AzPhysics::InvalidSimulatedBodyHandle || m_attachedSceneHandle == AzPhysics::InvalidSceneHandle)
+        {
+            return nullptr;
+        }
+
+        if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
+        {
+            return azdynamic_cast<PhysX::CharacterController*>(
+                sceneInterface->GetSimulatedBodyFromHandle(m_attachedSceneHandle, m_controllerBodyHandle));
+        }
+        return nullptr;
+    }
+
+    PhysX::CharacterController* CharacterControllerComponent::GetController()
+    {
+        return const_cast<PhysX::CharacterController*>(static_cast<const CharacterControllerComponent&>(*this).GetControllerConst());
+    }
+
     void CharacterControllerComponent::CreateController()
     {
         if (IsPhysicsEnabled())
@@ -399,9 +475,8 @@ namespace PhysX
             return;
         }
 
-        AzPhysics::SceneHandle defaultSceneHandle = AzPhysics::InvalidSceneHandle;
-        Physics::DefaultWorldBus::BroadcastResult(defaultSceneHandle, &Physics::DefaultWorldRequests::GetDefaultSceneHandle);
-        if (defaultSceneHandle == AzPhysics::InvalidSceneHandle)
+        Physics::DefaultWorldBus::BroadcastResult(m_attachedSceneHandle, &Physics::DefaultWorldRequests::GetDefaultSceneHandle);
+        if (m_attachedSceneHandle == AzPhysics::InvalidSceneHandle)
         {
             AZ_Error("PhysX Character Controller Component", false, "Failed to retrieve default scene.");
             return;
@@ -427,11 +502,9 @@ namespace PhysX
         auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get();
         if (sceneInterface != nullptr)
         {
-            m_controllerBodyHandle = sceneInterface->AddSimulatedBody(defaultSceneHandle, m_characterConfig.get());
-            m_controller = azdynamic_cast<PhysX::CharacterController*>(
-                sceneInterface->GetSimulatedBodyFromHandle(defaultSceneHandle, m_controllerBodyHandle));
+            m_controllerBodyHandle = sceneInterface->AddSimulatedBody(m_attachedSceneHandle, m_characterConfig.get());
         }
-        if (m_controller == nullptr)
+        if (m_controllerBodyHandle == AzPhysics::InvalidSimulatedBodyHandle)
         {
             AZ_Error("PhysX Character Controller Component", false, "Failed to create character controller.");
             return;
@@ -447,7 +520,7 @@ namespace PhysX
                         DestroyController();
                     }
                 });
-            sceneInterface->RegisterSimulationBodyRemovedHandler(defaultSceneHandle, m_onSimulatedBodyRemovedHandler);
+            sceneInterface->RegisterSimulationBodyRemovedHandler(m_attachedSceneHandle, m_onSimulatedBodyRemovedHandler);
         }
 
         CharacterControllerRequestBus::Handler::BusConnect(GetEntityId());
@@ -467,24 +540,23 @@ namespace PhysX
 
     void CharacterControllerComponent::DisableController()
     {
-        if (!IsPhysicsEnabled())
+        if (auto* controller = GetController())
         {
-            return;
+            controller->DisablePhysics();
+
+            if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
+            {
+                sceneInterface->RemoveSimulatedBody(m_attachedSceneHandle, controller->m_bodyHandle);
+            }
+
+            DestroyController();
         }
-
-        m_controller->DisablePhysics();
-
-        if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
-        {
-            sceneInterface->RemoveSimulatedBody(m_controller->m_sceneOwner, m_controller->m_bodyHandle);
-        }
-
-        DestroyController();
     }
 
     void CharacterControllerComponent::DestroyController()
     {
-        m_controller = nullptr;
+        m_controllerBodyHandle = AzPhysics::InvalidSimulatedBodyHandle;
+        m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
         m_preSimulateHandler.Disconnect();
         m_onSimulatedBodyRemovedHandler.Disconnect();
         CharacterControllerRequestBus::Handler::BusDisconnect();
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
index 7c25312b72..54513d52f4 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.h
@@ -131,6 +131,8 @@ namespace PhysX
         void ToggleCollisionLayer(const AZStd::string& layerName, AZ::Crc32 colliderTag, bool enabled) override;
 
     private:
+        const PhysX::CharacterController* GetControllerConst() const;
+        PhysX::CharacterController* GetController();
         // Creates the physics character controller in the current default physics scene.
         // This will do nothing if the controller is already created.
         void CreateController();
@@ -143,8 +145,8 @@ namespace PhysX
 
         AZStd::unique_ptr<Physics::CharacterConfiguration> m_characterConfig;
         AZStd::shared_ptr<Physics::ShapeConfiguration> m_shapeConfig;
-        PhysX::CharacterController* m_controller = nullptr;
         AzPhysics::SimulatedBodyHandle m_controllerBodyHandle = AzPhysics::InvalidSimulatedBodyHandle;
+        AzPhysics::SceneHandle m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
         AzPhysics::SystemEvents::OnPresimulateEvent::Handler m_preSimulateHandler;
         AzPhysics::SceneEvents::OnSimulationBodyRemoved::Handler m_onSimulatedBodyRemovedHandler;
     };
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index 4c58187fb8..8da512647f 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -170,63 +170,88 @@ namespace PhysX
     // RagdollPhysicsBus
     void RagdollComponent::EnableSimulation(const Physics::RagdollState& initialState)
     {
-        m_ragdoll->EnableSimulation(initialState);
+        if (auto* ragdoll = GetPhysXRagdoll())
+        {
+            ragdoll->EnableSimulation(initialState);
+        }
     }
 
     void RagdollComponent::EnableSimulationQueued(const Physics::RagdollState& initialState)
     {
-        m_ragdoll->EnableSimulationQueued(initialState);
+        if (auto* ragdoll = GetPhysXRagdoll())
+        {
+            ragdoll->EnableSimulationQueued(initialState);
+        }
     }
 
     void RagdollComponent::DisableSimulation()
     {
-        if (m_ragdoll)
+        if (auto* ragdoll = GetPhysXRagdoll())
         {
-            m_ragdoll->DisableSimulation();
+            ragdoll->DisableSimulation();
         }
     }
 
     void RagdollComponent::DisableSimulationQueued()
     {
-        if (m_ragdoll)
+        if (auto* ragdoll = GetPhysXRagdoll())
         {
-            m_ragdoll->DisableSimulationQueued();
+            ragdoll->DisableSimulationQueued();
         }
     }
 
     Physics::Ragdoll* RagdollComponent::GetRagdoll()
     {
-        return m_ragdoll;
+        return GetPhysXRagdoll();
     }
 
     void RagdollComponent::GetState(Physics::RagdollState& ragdollState) const
     {
-        m_ragdoll->GetState(ragdollState);
+        if (const auto* ragdoll = GetPhysXRagdollConst())
+        {
+            ragdoll->GetState(ragdollState);
+        }
     }
 
     void RagdollComponent::SetState(const Physics::RagdollState& ragdollState)
     {
-        m_ragdoll->SetState(ragdollState);
+        if (auto* ragdoll = GetPhysXRagdoll())
+        {
+            ragdoll->SetState(ragdollState);
+        }
     }
 
     void RagdollComponent::SetStateQueued(const Physics::RagdollState& ragdollState)
     {
-        m_ragdoll->SetStateQueued(ragdollState);
+        if (auto* ragdoll = GetPhysXRagdoll())
+        {
+            ragdoll->SetStateQueued(ragdollState);
+        }
     }
 
     void RagdollComponent::GetNodeState(size_t nodeIndex, Physics::RagdollNodeState& nodeState) const
     {
-        m_ragdoll->GetNodeState(nodeIndex, nodeState);
+        if (const auto* ragdoll = GetPhysXRagdollConst())
+        {
+            ragdoll->GetNodeState(nodeIndex, nodeState);
+        }
     }
 
     void RagdollComponent::SetNodeState(size_t nodeIndex, const Physics::RagdollNodeState& nodeState)
     {
-        m_ragdoll->SetNodeState(nodeIndex, nodeState);
+        if (auto* ragdoll = GetPhysXRagdoll())
+        {
+            ragdoll->SetNodeState(nodeIndex, nodeState);
+        }
     }
 
     Physics::RagdollNode* RagdollComponent::GetNode(size_t nodeIndex) const
     {
-        return m_ragdoll->GetNode(nodeIndex);
+        if (const auto* ragdoll = GetPhysXRagdollConst())
+        {
+            return ragdoll->GetNode(nodeIndex);
+        }
+        return nullptr;
     }
 
     void RagdollComponent::EnablePhysics()
@@ -245,14 +270,19 @@ namespace PhysX
 
     bool RagdollComponent::IsPhysicsEnabled() const
     {
-        return m_ragdoll && m_ragdoll->IsSimulated();
+        if (const auto* ragdoll = GetPhysXRagdollConst())
+        {
+            return ragdoll->IsSimulated();
+        }
+        return false;
+        
     }
 
     AZ::Aabb RagdollComponent::GetAabb() const
     {
-        if (m_ragdoll)
+        if (const auto* ragdoll = GetPhysXRagdollConst())
         {
-            return m_ragdoll->GetAabb();
+            return ragdoll->GetAabb();
         }
         return AZ::Aabb::CreateNull();
     }
@@ -264,18 +294,14 @@ namespace PhysX
 
     AzPhysics::SimulatedBodyHandle RagdollComponent::GetSimulatedBodyHandle() const
     {
-        if (m_ragdoll)
-        {
-            return m_ragdoll->m_bodyHandle;
-        }
-        return AzPhysics::InvalidSimulatedBodyHandle;
+        return m_ragdollHandle;
     }
 
     AzPhysics::SceneQueryHit RagdollComponent::RayCast(const AzPhysics::RayCastRequest& request)
     {
-        if (m_ragdoll)
+        if (auto* ragdoll = GetPhysXRagdoll())
         {
-            return m_ragdoll->RayCast(request);
+            return ragdoll->RayCast(request);
         }
         return AzPhysics::SceneQueryHit();
     }
@@ -323,23 +349,24 @@ namespace PhysX
         AZ::TransformBus::EventResult(entityTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
         ragdollConfiguration.m_initialState = GetBindPoseWorld(bindPose, entityTransform);
 
-        AzPhysics::SceneHandle defaultSceneHandle = AzPhysics::InvalidSceneHandle;
-        Physics::DefaultWorldBus::BroadcastResult(defaultSceneHandle, &Physics::DefaultWorldRequests::GetDefaultSceneHandle);
+        m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
+        Physics::DefaultWorldBus::BroadcastResult(m_attachedSceneHandle, &Physics::DefaultWorldRequests::GetDefaultSceneHandle);
 
         if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
         {
-            AzPhysics::SimulatedBodyHandle bodyHandle = sceneInterface->AddSimulatedBody(defaultSceneHandle, &ragdollConfiguration);
-            m_ragdoll = azdynamic_cast<PhysX::Ragdoll*>(sceneInterface->GetSimulatedBodyFromHandle(defaultSceneHandle, bodyHandle));
+            m_ragdollHandle = sceneInterface->AddSimulatedBody(m_attachedSceneHandle, &ragdollConfiguration);
         }
-        if (m_ragdoll == nullptr)
+        auto* ragdoll = GetPhysXRagdoll();
+        if (ragdoll == nullptr ||
+            m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle)
         {
             AZ_Error("PhysX Ragdoll Component", false, "Failed to create ragdoll.");
             return;
         }
-
+        
         for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++)
         {
-            if (physx::PxRigidDynamic* pxRigidBody = m_ragdoll->GetPxRigidDynamic(nodeIndex))
+            if (physx::PxRigidDynamic* pxRigidBody = ragdoll->GetPxRigidDynamic(nodeIndex))
             {
                 pxRigidBody->setSolverIterationCounts(m_positionIterations, m_velocityIterations);
             }
@@ -352,7 +379,7 @@ namespace PhysX
 
             for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++)
             {
-                if (const AZStd::shared_ptr<Physics::Joint>& joint = m_ragdoll->GetNode(nodeIndex)->GetJoint())
+                if (const AZStd::shared_ptr<Physics::Joint>& joint = ragdoll->GetNode(nodeIndex)->GetJoint())
                 {
                     if (auto* pxJoint = static_cast<physx::PxD6Joint*>(joint->GetNativePointer()))
                     {
@@ -374,20 +401,41 @@ namespace PhysX
 
     void RagdollComponent::DestroyRagdoll()
     {
-        if (m_ragdoll)
+        if (m_ragdollHandle != AzPhysics::InvalidSimulatedBodyHandle && 
+            m_attachedSceneHandle != AzPhysics::InvalidSceneHandle)
         {
             AzFramework::RagdollPhysicsRequestBus::Handler::BusDisconnect();
-            AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(),
-                &AzFramework::RagdollPhysicsNotifications::OnRagdollDeactivated);
+            AzFramework::RagdollPhysicsNotificationBus::Event(
+                GetEntityId(), &AzFramework::RagdollPhysicsNotifications::OnRagdollDeactivated);
 
             if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
             {
-                sceneInterface->RemoveSimulatedBody(m_ragdoll->m_sceneOwner, m_ragdoll->m_bodyHandle);
+                sceneInterface->RemoveSimulatedBody(m_attachedSceneHandle, m_ragdollHandle);
+                m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
             }
-            m_ragdoll = nullptr;
         }
     }
 
+    Ragdoll* RagdollComponent::GetPhysXRagdoll()
+    {
+        return const_cast<Ragdoll*>(static_cast<const RagdollComponent&>(*this).GetPhysXRagdollConst());
+    }
+
+    const Ragdoll* RagdollComponent::GetPhysXRagdollConst() const
+    {
+        if (m_ragdollHandle == AzPhysics::InvalidSimulatedBodyHandle ||
+            m_attachedSceneHandle == AzPhysics::InvalidSceneHandle)
+        {
+            return nullptr;
+        }
+
+        if (auto* sceneInterface = AZ::Interface<AzPhysics::SceneInterface>::Get())
+        {
+            return azdynamic_cast<PhysX::Ragdoll*>(sceneInterface->GetSimulatedBodyFromHandle(m_attachedSceneHandle, m_ragdollHandle));
+        }
+        return nullptr;
+    }
+
     // deprecated Cry functions
     void RagdollComponent::EnterRagdoll()
     {
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
index a02e9c47fb..2c265b0f73 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h
@@ -104,10 +104,13 @@ namespace PhysX
     private:
         void CreateRagdoll(const Physics::RagdollConfiguration& ragdollConfiguration);
         void DestroyRagdoll();
+        Ragdoll* GetPhysXRagdoll();
+        const Ragdoll* GetPhysXRagdollConst() const;
 
         bool IsJointProjectionVisible();
 
-        Ragdoll* m_ragdoll;
+        AzPhysics::SimulatedBodyHandle m_ragdollHandle = AzPhysics::InvalidSimulatedBodyHandle;
+        AzPhysics::SceneHandle m_attachedSceneHandle = AzPhysics::InvalidSceneHandle;
         /// Minimum number of position iterations to perform in the PhysX solver.
         /// Lower iteration counts are less expensive but may behave less realistically.
         AZ::u32 m_positionIterations = 16; 
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
index 3987936b8c..430ef7aef3 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
@@ -196,7 +196,7 @@ namespace PhysX
                     AZ::Transform::CreateFromQuaternionAndTranslation(colliderConfiguration.m_rotation, colliderConfiguration.m_position);
 
                 AZ::Transform shapeTransform = *m_transform;
-                shapeTransform.ExtractScale();
+                shapeTransform.ExtractUniformScale();
 
                 shapeTransform = existingTransform * shapeTransform;
 
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
index 7069f9a05d..3aeb3ad797 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
@@ -328,7 +328,7 @@ namespace PhysX
             physx::PxMeshMidPhase::Enum ret = physx::PxMeshMidPhase::eBVH34;
 
             // Fallback to 3.3 on Android and iOS platforms since they don't support SSE2, which is required for 3.4
-            if (platformIdentifier == "es3" || platformIdentifier == "ios")
+            if (platformIdentifier == "android" || platformIdentifier == "ios")
             {
                 ret = physx::PxMeshMidPhase::eBVH33;
             }
diff --git a/Gems/PhysX/Code/Source/RigidBodyComponent.cpp b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
index feb35ea07d..40cac1e19e 100644
--- a/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
@@ -201,7 +201,7 @@ namespace PhysX
             AZ::Quaternion newRotation = AZ::Quaternion::CreateIdentity();
             m_interpolator->GetInterpolated(newPosition, newRotation, deltaTime);
 
-            AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetRotationQuaternion, newRotation);
+            AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetWorldRotationQuaternion, newRotation);
             AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetWorldTranslation, newPosition);
         }
     }
@@ -256,7 +256,7 @@ namespace PhysX
         }
         else
         {
-            AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetRotationQuaternion, rigidBody->GetOrientation());
+            AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetWorldRotationQuaternion, rigidBody->GetOrientation());
             AZ::TransformBus::Event(GetEntityId(), &AZ::TransformInterface::SetWorldTranslation, rigidBody->GetPosition());
         }
         m_isLastMovementFromKinematicSource = false;
diff --git a/Gems/PhysX/Code/Source/Utils.cpp b/Gems/PhysX/Code/Source/Utils.cpp
index a85426d532..55be7c92f7 100644
--- a/Gems/PhysX/Code/Source/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Utils.cpp
@@ -718,7 +718,7 @@ namespace PhysX
             const float boundsInflationFactor = 1.0f;
             AZ::Transform overallTransformNoScale = GetColliderWorldTransform(worldTransform,
                 colliderConfiguration.m_position, colliderConfiguration.m_rotation);
-            overallTransformNoScale.ExtractScale();
+            overallTransformNoScale.ExtractUniformScale();
             const physx::PxBounds3 bounds = physx::PxGeometryQuery::getWorldBounds(geometryHolder.any(),
                 PxMathConvert(overallTransformNoScale),
                 boundsInflationFactor);
@@ -1378,7 +1378,7 @@ namespace PhysX
             AZ::TransformBus::EventResult(worldTransformWithoutScale
                 , entityId
                 , &AZ::TransformInterface::GetWorldTM);
-            worldTransformWithoutScale.ExtractScale();
+            worldTransformWithoutScale.ExtractUniformScale();
             return worldTransformWithoutScale;
         }
 
@@ -1386,10 +1386,10 @@ namespace PhysX
             const AZ::Transform& entityWorldTransform)
         {
             AZ::Transform jointWorldTransformWithoutScale = jointWorldTransform;
-            jointWorldTransformWithoutScale.ExtractScale();
+            jointWorldTransformWithoutScale.ExtractUniformScale();
 
             AZ::Transform entityWorldTransformWithoutScale = entityWorldTransform;
-            entityWorldTransformWithoutScale.ExtractScale();
+            entityWorldTransformWithoutScale.ExtractUniformScale();
             AZ::Transform entityWorldTransformInverse = entityWorldTransformWithoutScale.GetInverse();
 
             return entityWorldTransformInverse * jointWorldTransformWithoutScale;
@@ -1399,10 +1399,10 @@ namespace PhysX
             const AZ::Transform& entityWorldTransform)
         {
             AZ::Transform jointLocalTransformWithoutScale = jointLocalTransform;
-            jointLocalTransformWithoutScale.ExtractScale();
+            jointLocalTransformWithoutScale.ExtractUniformScale();
 
             AZ::Transform entityWorldTransformWithoutScale = entityWorldTransform;
-            entityWorldTransformWithoutScale.ExtractScale();
+            entityWorldTransformWithoutScale.ExtractUniformScale();
 
             return entityWorldTransformWithoutScale * jointLocalTransformWithoutScale;
         }
diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings
index c2fe2400cb..9da169c456 100644
--- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings
+++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_ddna.tif.imagesettings
@@ -17,7 +17,7 @@
 		<Class name="unsigned int" field="MipMapGenType" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
@@ -81,7 +81,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings
index c3632028c2..43410a50df 100644
--- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings
+++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Textures/Cowboy_01_spec.tif.imagesettings
@@ -17,7 +17,7 @@
 		<Class name="unsigned int" field="MipMapGenType" value="5" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{B2CCA964-7EF4-5D2C-9287-3459190A2409}">
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
@@ -81,7 +81,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{8A18E0EA-6900-559F-9C8F-9DE74BC308F5}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{3A8D5EC9-D70E-41CB-879C-DEF6A6D6ED03}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{CC3ED018-7FF7-4233-AAD8-6D3115FD844A}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="AZStd::unordered_map" field="m_patch" type="{CF3B3C65-49C0-5199-B671-E75347EB25C2}">
diff --git a/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
index 2bb0d8aaf3..ace089b9bd 100644
--- a/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
+++ b/Gems/Prefab/PrefabBuilder/PrefabBuilderTests.cpp
@@ -14,6 +14,7 @@
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/Json/JsonSystemComponent.h>
 #include <AzCore/Serialization/Json/RegistrationContext.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 
 namespace UnitTest
@@ -172,6 +173,12 @@ namespace UnitTest
 
     void PrefabBuilderTests::SetUp()
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         AZ::ComponentApplication::Descriptor desc;
         m_app.Start(desc);
         m_app.CreateReflectionManager();
diff --git a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
index e71a5207d0..25faca3667 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.cpp
@@ -72,6 +72,11 @@ namespace SceneBuilder
         m_sceneBuilder.BusDisconnect();
     }
 
+    void BuilderPluginComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
+    }
+
     void BuilderPluginComponent::Reflect(AZ::ReflectContext* context)
     {
         AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
@@ -81,5 +86,4 @@ namespace SceneBuilder
                 ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AssetBuilderSDK::ComponentTags::AssetBuilder }));
         }
     }
-
 } // namespace SceneBuilder
diff --git a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
index c1fc6ebb36..aed5e1b026 100644
--- a/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
+++ b/Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderComponent.h
@@ -32,6 +32,8 @@ namespace SceneBuilder
         void Activate() override;
         void Deactivate() override;
         
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        
     private:
         SceneBuilderWorker m_sceneBuilder;
     };
diff --git a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
index 5f96353996..2a89911fda 100644
--- a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderPhasesTests.cpp
@@ -16,6 +16,7 @@
 #include <AzCore/Component/ComponentApplication.h>
 #include <AzCore/Module/Environment.h>
 #include <AzCore/RTTI/ReflectContext.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
@@ -139,6 +140,12 @@ class SceneBuilderPhasesFixture
 public:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         m_app.Start(AZ::ComponentApplication::Descriptor());
 
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
index 66fd717508..2287077c89 100644
--- a/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
+++ b/Gems/SceneProcessing/Code/Tests/SceneBuilder/SceneBuilderTests.cpp
@@ -13,6 +13,7 @@
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/IO/Path/Path.h>
+#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzFramework/StringFunc/StringFunc.h>
@@ -30,6 +31,12 @@ class SceneBuilderTests
 protected:
     void SetUp() override
     {
+        AZ::SettingsRegistryInterface* registry = AZ::SettingsRegistry::Get();
+        auto projectPathKey =
+            AZ::SettingsRegistryInterface::FixedValueString(AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey) + "/project_path";
+        registry->Set(projectPathKey, "AutomatedTesting");
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(*registry);
+
         m_app.Start(AZ::ComponentApplication::Descriptor());
         AZ::Debug::TraceMessageBus::Handler::BusConnect();
         // Without this, the user settings component would attempt to save on finalize/shutdown. Since the file is
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Pressed.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Sliced_Selected.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Pressed.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Button_Stretched_Selected.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Check_Background.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Cross.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_Off.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/CheckBox_On.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Hover.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkbox_Background_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Checkered.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Hover.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Background_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Sliced.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Fill_Stretch.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Manipulator.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Sliced.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Slider_Track_Stretch.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Pressed.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo
+++ b/Gems/UiBasics/Assets/Textures/Basic/Text_Input_Sliced_Selected.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Arrow.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowL.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowR.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_ArrowU.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo
index 95b548a2eb..f808dda121 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Button.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/Dropdown_Menu.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Hover.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Background_Normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/RadioButton_Dot.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/button_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_hover.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo
index 2eb5be8e93..54e075dd32 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_box_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -56,7 +56,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -64,7 +64,7 @@
 						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
 							<Class name="AddressType" field="value1" value="AZStd::string({03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9})::OverridingPlatform·0/" version="1" type="{90752F2D-CBD3-4EE9-9CDD-447E797C8408}"/>
 							<Class name="any" field="value2" type="{03924488-C7F4-4D6D-948B-ABC2D1AE2FD3}">
-								<Class name="AZStd::string" field="m_data" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+								<Class name="AZStd::string" field="m_data" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 							</Class>
 						</Class>
 						<Class name="AZStd::pair" field="element" type="{FED51EB4-F646-51FF-9646-9852CF90F353}">
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/checkbox_check.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo
index 95b548a2eb..f808dda121 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_handle.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_horiz_track.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/scrollbar_vert_track.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_fill_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo
index 95b548a2eb..f808dda121 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_handle_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo
index 61b2832ff3..47b628d60a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/slider_track_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_disabled.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_hover.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo
index c6f6ca1e9c..c8704c4e0d 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/textinput_normal.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="5" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo b/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo
index dd1d22706e..e508d7465a 100644
--- a/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo
+++ b/Gems/UiBasics/Assets/UI/Textures/Prefab/tooltip_sliced.tif.assetinfo
@@ -17,7 +17,7 @@
 		<Class name="ImageProcessingAtom::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
diff --git a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
index 597d0ca079..a185c9a601 100644
--- a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
@@ -309,7 +309,7 @@ namespace Vegetation
 
         // Create a Transform that represents our instance.
         AZ::Transform world = AZ::Transform::CreateFromQuaternionAndTranslation(instanceData.m_alignment * instanceData.m_rotation, instanceData.m_position);
-        world.MultiplyByScale(AZ::Vector3(instanceData.m_scale));
+        world.MultiplyByUniformScale(instanceData.m_scale);
 
         // Request a new dynamic slice instance.
         AzFramework::SliceInstantiationTicket* ticket = new AzFramework::SliceInstantiationTicket();
diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
index 41d0a4c5e3..cda82c82b0 100644
--- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
+++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp
@@ -139,7 +139,7 @@ namespace WhiteBox
     {
         const AZ::Transform worldTransformWithoutScale = [worldTransform = world]() mutable
         {
-            worldTransform.SetScale(AZ::Vector3::CreateOne());
+            worldTransform.SetUniformScale(1.0f);
             return worldTransform;
         }();
 
diff --git a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
index 9d423d5519..840d1f4590 100644
--- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
+++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp
@@ -73,7 +73,7 @@ namespace WhiteBox
         const AZ::Transform spaceFromLocal = localFromSpace.GetInverse();
         const AZ::Vector3 spacePosition = spaceFromLocal.TransformPoint(localPosition);
         const AZ::Vector3 spaceScaledPosition =
-            AZ::Transform::CreateScale(AZ::Vector3(scale)).TransformPoint(spacePosition);
+            AZ::Transform::CreateUniformScale(scale).TransformPoint(spacePosition);
         return localFromSpace.TransformPoint(spaceScaledPosition);
     }
 
diff --git a/Registry/AssetProcessorPlatformConfig.setreg b/Registry/AssetProcessorPlatformConfig.setreg
index 5f397db06b..2147842da7 100644
--- a/Registry/AssetProcessorPlatformConfig.setreg
+++ b/Registry/AssetProcessorPlatformConfig.setreg
@@ -24,13 +24,13 @@
                 "Platform pc": {
                     "tags": "tools,renderer,dx12,vulkan,null"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer,vulkan"
                 },
                 "Platform ios": {
                     "tags": "mobile,renderer,metal"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer,metal,null"
                 },
                 // this is an example of a headless platform that has no renderer.   
@@ -43,9 +43,9 @@
                 // To enable any additional platform, just uncomment the appropriate line below.
                 "Platforms": {
                     //"pc": "enabled",
-                    //"es3": "enabled",
+                    //"android": "enabled",
                     //"ios": "enabled",
-                    //"osx_gl": "enabled",
+                    //"mac": "enabled",
                     //"server": "enabled"
                 },
                 // ---- The number of worker jobs, 0 means use the number of Logical Cores
@@ -95,11 +95,11 @@
                 //  "exclude": "(comma seperated platform tags or identifiers)"
                 // }
                 // For example if you want to include a scan folder only for platforms that have the platform tags tools and renderer 
-                // but omit it for platform osx_gl, you will have a scanfolder rule like
+                // but omit it for platform mac, you will have a scanfolder rule like
                 // "ScanFolder (unique identifier)": {
                 // "watch": "@ROOT@/foo",
                 // "include": "tools, renderer",
-                // "exclude": "osx_gl"
+                // "exclude": "mac"
                 // }
 
                 "ScanFolder Game": {
diff --git a/Registry/bootstrap.setreg b/Registry/bootstrap.setreg
index b0c954a127..ccbf744232 100644
--- a/Registry/bootstrap.setreg
+++ b/Registry/bootstrap.setreg
@@ -8,9 +8,9 @@
                 "ios_remote_filesystem": 0,
                 "mac_remote_filesystem": 0,
                 "assets": "pc",
-                "android_assets": "es3",
+                "android_assets": "android",
                 "ios_assets": "ios",
-                "mac_assets": "osx_gl",
+                "mac_assets": "mac",
                 "allowed_list": "",
                 "remote_ip": "127.0.0.1",
                 "remote_port": 45643,
diff --git a/Registry/sceneassetimporter.setreg b/Registry/sceneassetimporter.setreg
new file mode 100644
index 0000000000..bd7c4d0705
--- /dev/null
+++ b/Registry/sceneassetimporter.setreg
@@ -0,0 +1,16 @@
+{
+	"O3DE":
+	{
+		"SceneAPI":
+		{
+			"AssetImporter":
+			{
+				"SupportedFileTypeExtensions":
+				[
+					".fbx",
+					".stl"
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Templates/DefaultProject/Template/preview.png b/Templates/DefaultProject/Template/preview.png
index 2191a0ebc2..3d4fe78063 100644
--- a/Templates/DefaultProject/Template/preview.png
+++ b/Templates/DefaultProject/Template/preview.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a18fae4040a22d2bb359a8ca642b97bb8f6468eeb52e2826b3b029bd8f1350b6
-size 5466
+oid sha256:40949893ed7009eeaa90b7ce6057cb6be9dfaf7b162e3c26ba9dadf985939d7d
+size 2038
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 5f6db7ac05..ec4b43b023 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
@@ -16,8 +16,10 @@ import pathlib
 import warnings
 from abc import ABCMeta, abstractmethod
 
+import ly_test_tools._internal.pytest_plugin
 from ly_test_tools.environment.file_system import find_ancestor_file
 
+
 def _find_engine_root(initial_path):
     # type: (str) -> str
     """
@@ -34,11 +36,9 @@ def _find_engine_root(initial_path):
     # Assumes folder structure similar to: engine_root/dev/Tools/.../ly_test_tools/builtin
     for _ in range(15):
         if os.path.exists(os.path.join(current_dir, root_file)):
-            # The parent of the directory containing the engineroot.txt is the root directory
-            engine_root = current_dir
-            return engine_root
-        # Using an explicit else to avoid aberrant behavior from following filesystem links
-        else:
+            # parent of the directory containing root_file
+            return current_dir
+        else:  # explicit else avoids aberrant behavior from following filesystem links
             current_dir = os.path.abspath(os.path.join(current_dir, os.path.pardir))
 
     raise OSError(f"Unable to find engine root directory. Verify root file '{root_file}' exists")
@@ -50,8 +50,10 @@ def _find_project_json(engine_root, project):
     Find the project.json file for this project.
     :return: Full path to the project.json file
     """
-    project_json = find_ancestor_file('project.json')
-    if not project_json:
+    # First check relative to defined build directory, for external projects which configure through SDK settings
+    project_json = find_ancestor_file(target_file_name='project.json',
+                                      start_path=ly_test_tools._internal.pytest_plugin.build_directory)
+    if not project_json:  # check internally for a project bundled with the engine
         project_json = os.path.join(engine_root, project, 'project.json')
 
     return project_json
@@ -250,9 +252,6 @@ class AbstractResourceLocator(object):
         """
         return os.path.join(self.build_directory(), 'CrySCompileServer')
 
-    def bootstrap_config_file(self):
-        return os.path.join(self.engine_root(), 'bootstrap.cfg')
-
     def asset_processor_config_file(self):
         return os.path.join(self.engine_root(), 'Registry', 'AssetProcessorPlatformConfig.setreg')
 
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
index 453e80ac41..4e19a3955a 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/mac.py
@@ -21,8 +21,8 @@ from ly_test_tools._internal.managers.abstract_resource_locator import AbstractR
 
 logger = logging.getLogger(__name__)
 
-CACHE_DIR = 'osx_gl'
-CONFIG_FILE = 'system_osx_osx_gl.cfg'
+CACHE_DIR = 'mac'
+CONFIG_FILE = 'system_osx_mac.cfg'
 
 
 class _MacResourceLocator(AbstractResourceLocator):
@@ -33,7 +33,7 @@ class _MacResourceLocator(AbstractResourceLocator):
     def platform_config_file(self):
         """
         Return the path to the platform config file.
-        ex. engine_root/dev/system_osx_osx_gl.cfg
+        ex. engine_root/dev/system_osx_mac.cfg
         :return: path to the platform config file
         """
         return os.path.join(self.engine_root(), CONFIG_FILE)
diff --git a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
index 80ac413dbb..db6e7d713d 100755
--- a/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
+++ b/Tools/LyTestTools/ly_test_tools/_internal/managers/platforms/windows.py
@@ -39,7 +39,7 @@ class _WindowsResourceLocator(AbstractResourceLocator):
     def platform_config_file(self):
         """
         Return the path to the platform config file.
-        ex. engine_root/dev/system_osx_osx_gl.cfg
+        ex. engine_root/dev/system_osx_mac.cfg
         :return: path to the platform config file
         """
         return os.path.join(self.engine_root(), CONFIG_FILE)
diff --git a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
index 1b0afb3efe..386de62048 100755
--- a/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
+++ b/Tools/LyTestTools/ly_test_tools/launchers/platforms/base.py
@@ -123,7 +123,6 @@ class Launcher(object):
         """
         backup_path = self.workspace.settings.get_temp_path()
         log.debug(f"Performing automatic backup of bootstrap, platform and user settings in path {backup_path}")
-        self.workspace.settings.backup_bootstrap_settings(backup_path)
         self.workspace.settings.backup_platform_settings(backup_path)
         self.workspace.settings.backup_shader_compiler_settings(backup_path)
 
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
index 5507588ae3..8e2b93c20a 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor.py
@@ -36,10 +36,10 @@ DEFAULT_TIMEOUT_HOURS = 8
 DEFAULT_TIMEOUT_SECONDS = 300
 
 ASSET_PROCESSOR_PLATFORM_MAP = {
-    'android': 'es3',
+    'android': 'android',
     'ios': 'ios',
     'linux': 'linux',  # Not fully implemented, see SPEC-2501
-    'mac': 'osx_gl',
+    'mac': 'mac',
     'windows': 'pc',
 }
 
@@ -664,8 +664,7 @@ class AssetProcessor(object):
             make_dir = os.path.join(self._temp_asset_root, copy_dir)
             if not os.path.isdir(make_dir):
                 os.makedirs(make_dir)
-        for copyfile_name in ['bootstrap.cfg',
-                              'Registry/AssetProcessorPlatformConfig.setreg',
+        for copyfile_name in ['Registry/AssetProcessorPlatformConfig.setreg',
                               os.path.join(self._workspace.project, "project.json"),
                               os.path.join('Assets', 'Engine', 'exclude.filetag')]:
             shutil.copyfile(os.path.join(self._workspace.paths.engine_root(), copyfile_name),
diff --git a/Tools/LyTestTools/ly_test_tools/o3de/settings.py b/Tools/LyTestTools/ly_test_tools/o3de/settings.py
index 9677a4d3a3..a1e83abe51 100644
--- a/Tools/LyTestTools/ly_test_tools/o3de/settings.py
+++ b/Tools/LyTestTools/ly_test_tools/o3de/settings.py
@@ -57,14 +57,6 @@ class LySettings(object):
         """
         self._backup_settings(self._resource_locator.platform_config_file(), backup_path)
 
-    def backup_bootstrap_settings(self, backup_path=None):
-        """
-        Creates a backup of the bootstrap settings file (~/dev/bootstrap.cfg) in the backup_path. If no path is
-        provided, it will store in the workspace temp path (the contents of the workspace temp directory are removed
-        during workspace teardown)
-        """
-        self._backup_settings(self._resource_locator.bootstrap_config_file(), backup_path)
-
     def backup_shader_compiler_settings(self, backup_path=None):
         self._backup_settings(self._resource_locator.shader_compiler_config_file(), backup_path)
 
@@ -79,14 +71,6 @@ class LySettings(object):
         """
         self._restore_settings(self._resource_locator.platform_config_file(), backup_path)
 
-    def restore_bootstrap_settings(self, backup_path=None):
-        """
-        Restores the bootstrap settings file (~/dev/bootstrap.cfg) from its backup.
-        The backup is stored in the backup_path.
-        If no backup_path is provided, it will attempt to retrieve the backup from the workspace temp path.
-        """
-        self._restore_settings(self._resource_locator.bootstrap_config_file(), backup_path)
-
     def restore_shader_compiler_settings(self, backup_path=None):
         self._restore_settings(self._resource_locator.shader_compiler_config_file(), backup_path)
 
diff --git a/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
index e46fefa461..12286b3dd7 100755
--- a/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
+++ b/Tools/LyTestTools/tests/unit/test_abstract_resource_locator.py
@@ -158,13 +158,6 @@ class TestAbstractResourceLocator(object):
 
         assert mock_abstract_resource_locator.shader_cache() == expected_path
 
-    def test_BootstrapConfigFile_IsCalled_ReturnBootstrapConfigFilePath(self):
-        mock_abstract_resource_locator = abstract_resource_locator.AbstractResourceLocator(
-            mock_build_directory, mock_project)
-        expected_path = os.path.join(mock_abstract_resource_locator.engine_root(), 'bootstrap.cfg')
-
-        assert mock_abstract_resource_locator.bootstrap_config_file() == expected_path
-
     def test_AssetProcessorConfigFile_IsCalled_ReturnsAssetProcessorConfigFilePath(self):
         mock_abstract_resource_locator = abstract_resource_locator.AbstractResourceLocator(
             mock_build_directory, mock_project)
diff --git a/bootstrap.cfg b/bootstrap.cfg
deleted file mode 100644
index 858e9093f5..0000000000
--- a/bootstrap.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-; This file is deprecated and is only use currently for setting the path when running O3DE in an engine-centric manner
-; By engine-centric, what is meant is using CMake to configure from the <engine-root> directory and passing in the LY_PROJECTS value
-
-project_path=AutomatedTesting
-
-; The Asset Processor Specific settings are now the <engine-root>/Engine/Registry/bootstrap.setreg settings
-; The Engine specific settings can be overridden in order of least precedence to most
-; 1. Override the settings in a "<gem-root>/Registry/*.setreg(patch)" file (Shared per Gem Settings)
-; 2. Override the settings in a "<project-root>/Registry/*.setreg(patch)" file (Shared per Project Settings)
-; 3. Override the settings in a "<project-root>/user/Registry/*.setreg(patch)" file (User per Project Settings)
-; 4. Override the settings in a "~/.o3de/Registry/*.setreg(patch)" file (User Global Settings) 
-; Where "~" is %USERPROFILE% on Windows and $HOME on Unix like platforms
diff --git a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
index 3cd453b943..3220271b42 100644
--- a/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
+++ b/cmake/3rdParty/Platform/Linux/BuiltInPackages_linux.cmake
@@ -10,40 +10,41 @@
 #
 
 # shared by other platforms:
-ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform             TARGETS zlib        PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
-ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform          TARGETS ilmbase     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
-ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform            TARGETS hdf5        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
-ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform         TARGETS alembic     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform           TARGETS assimplib   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
-ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform    TARGETS squish-ccr  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
-ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform TARGETS ASTCEncoder PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
-ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                     TARGETS md5         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
-ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform             TARGETS RapidJSON   PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
-ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform               TARGETS RapidXML    PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
-ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform         TARGETS pybind11    PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
-ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                TARGETS cityhash    PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
-ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                    TARGETS lz4         PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
-ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                 TARGETS expat       PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
-ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                   TARGETS zstd        PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
-ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform          TARGETS SQLite      PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
-ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform        TARGETS glad        PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
-ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform           TARGETS lux_core    PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
-ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform           TARGETS xxhash      PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
-ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform      TARGETS PVRTexTool  PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
+ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform                     TARGETS zlib                        PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
+ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                  TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
+ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                    TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
+ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                 TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                   TARGETS assimplib                   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
+ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform            TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
+ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform         TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
+ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                             TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
+ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform                     TARGETS RapidJSON                   PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
+ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform                       TARGETS RapidXML                    PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
+ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform                 TARGETS pybind11                    PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
+ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                        TARGETS cityhash                    PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
+ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                            TARGETS lz4                         PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
+ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                         TARGETS expat                       PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
+ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                           TARGETS zstd                        PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
+ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                  TARGETS SQLite                      PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
+ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                TARGETS glad                        PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
+ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                   TARGETS lux_core                    PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
+ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform                   TARGETS xxhash                      PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
+ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform              TARGETS PVRTexTool                  PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
 
 # platform-specific:
-ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-linux   TARGETS AWSGameLiftServerSDK   PACKAGE_HASH a8149a95bd100384af6ade97e2b21a56173740d921e6c3da8188cd51554d39af)
-ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-linux          TARGETS freetype        PACKAGE_HASH 9ad246873067717962c6b780d28a5ce3cef3321b73c9aea746a039c798f52e93)
-ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-linux               TARGETS tiff            PACKAGE_HASH ae92b4d3b189c42ef644abc5cac865d1fb2eb7cb5622ec17e35642b00d1a0a76)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-linux   TARGETS AWSNativeSDK    PACKAGE_HASH b4db38de49d35a5f7500aed7f4aee5ec511dd3b584ee06fe9097885690191a5d)
-ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-linux              TARGETS Lua             PACKAGE_HASH 1adc812abe3dd0dbb2ca9756f81d8f0e0ba45779ac85bf1d8455b25c531a38b0)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-linux   TARGETS PhysX           PACKAGE_HASH e3ca36106a8dbf1524709f8bb82d520920ebd3ff3a92672d382efff406c75ee3)
-ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-linux    TARGETS etc2comp        PACKAGE_HASH 9283aa5db5bb7fb90a0ddb7a9f3895317c8ebe8044943124bbb3673a41407430)
-ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-linux        TARGETS mcpp            PACKAGE_HASH 0aa713f3f2c156cb2f17d9b800aed8acf9df5ab167c48b679853ecb040da9a67)
-ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-linux           TARGETS mikkelsen       PACKAGE_HASH 5973b1e71a64633588eecdb5b5c06ca0081f7be97230f6ef64365cbda315b9c8)
-ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-linux       TARGETS googletest      PACKAGE_HASH 7b7ad330f369450c316a4c4592d17fbb4c14c731c95bd8f37757203e8c2bbc1b)
-ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-linux  TARGETS GoogleBenchmark PACKAGE_HASH 4038878f337fc7e0274f0230f71851b385b2e0327c495fc3dd3d1c18a807928d)
-ly_associate_package(PACKAGE_NAME unwind-1.2.1-linux                TARGETS unwind          PACKAGE_HASH 3453265fb056e25432f611a61546a25f60388e315515ad39007b5925dd054a77)
-ly_associate_package(PACKAGE_NAME qt-5.15.2-rev3-linux              TARGETS Qt              PACKAGE_HASH b7d9932647f4b138b3f0b124d70debd250d2a8a6dca52b04dcbe82c6369d48ca)
-ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-linux    TARGETS libsamplerate   PACKAGE_HASH 41643c31bc6b7d037f895f89d8d8d6369e906b92eff42b0fe05ee6a100f06261)
-ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-linux         TARGETS OpenSSL         PACKAGE_HASH b779426d1e9c5ddf71160d5ae2e639c3b956e0fb5e9fcaf9ce97c4526024e3bc)
+ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-linux             TARGETS AWSGameLiftServerSDK        PACKAGE_HASH a8149a95bd100384af6ade97e2b21a56173740d921e6c3da8188cd51554d39af)
+ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-linux                          TARGETS freetype                    PACKAGE_HASH 9ad246873067717962c6b780d28a5ce3cef3321b73c9aea746a039c798f52e93)
+ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-linux                               TARGETS tiff                        PACKAGE_HASH ae92b4d3b189c42ef644abc5cac865d1fb2eb7cb5622ec17e35642b00d1a0a76)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev4-linux                   TARGETS AWSNativeSDK                PACKAGE_HASH b4db38de49d35a5f7500aed7f4aee5ec511dd3b584ee06fe9097885690191a5d)
+ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-linux                              TARGETS Lua                         PACKAGE_HASH 1adc812abe3dd0dbb2ca9756f81d8f0e0ba45779ac85bf1d8455b25c531a38b0)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-linux                   TARGETS PhysX                       PACKAGE_HASH e3ca36106a8dbf1524709f8bb82d520920ebd3ff3a92672d382efff406c75ee3)
+ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-linux                    TARGETS etc2comp                    PACKAGE_HASH 9283aa5db5bb7fb90a0ddb7a9f3895317c8ebe8044943124bbb3673a41407430)
+ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-linux                        TARGETS mcpp                        PACKAGE_HASH 0aa713f3f2c156cb2f17d9b800aed8acf9df5ab167c48b679853ecb040da9a67)
+ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-linux                           TARGETS mikkelsen                   PACKAGE_HASH 5973b1e71a64633588eecdb5b5c06ca0081f7be97230f6ef64365cbda315b9c8)
+ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-linux                       TARGETS googletest                  PACKAGE_HASH 7b7ad330f369450c316a4c4592d17fbb4c14c731c95bd8f37757203e8c2bbc1b)
+ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-linux                  TARGETS GoogleBenchmark             PACKAGE_HASH 4038878f337fc7e0274f0230f71851b385b2e0327c495fc3dd3d1c18a807928d)
+ly_associate_package(PACKAGE_NAME unwind-1.2.1-linux                                TARGETS unwind                      PACKAGE_HASH 3453265fb056e25432f611a61546a25f60388e315515ad39007b5925dd054a77)
+ly_associate_package(PACKAGE_NAME qt-5.15.2-rev3-linux                              TARGETS Qt                          PACKAGE_HASH b7d9932647f4b138b3f0b124d70debd250d2a8a6dca52b04dcbe82c6369d48ca)
+ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-linux                    TARGETS libsamplerate               PACKAGE_HASH 41643c31bc6b7d037f895f89d8d8d6369e906b92eff42b0fe05ee6a100f06261)
+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-rev2-linux TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 235606f98512c076a1ba84a8402ad24ac21945998abcea264e8e204678efc0ba)
diff --git a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
index cf5ecaa15b..f85048d13e 100644
--- a/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
+++ b/cmake/3rdParty/Platform/Mac/BuiltInPackages_mac.cmake
@@ -10,41 +10,41 @@
 #
 
 # shared by other platforms:
-ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform                          TARGETS zlib                       PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
-ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                       TARGETS ilmbase                    PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
-ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                         TARGETS hdf5                       PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
-ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                      TARGETS alembic                    PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                        TARGETS assimplib                  PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
-ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform                 TARGETS squish-ccr                 PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
-ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform              TARGETS ASTCEncoder                PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
-ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                                  TARGETS md5                        PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
-ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform                          TARGETS RapidJSON                  PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
-ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform                            TARGETS RapidXML                   PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
-ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform                      TARGETS pybind11                   PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
-ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                             TARGETS cityhash                   PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
-ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                                 TARGETS lz4                        PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
-ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                              TARGETS expat                      PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
-ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                                TARGETS zstd                       PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
-ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                       TARGETS SQLite                     PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
-ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-mac                         TARGETS SPIRVCross                 PACKAGE_HASH 78c6376ed2fd195b9b1f5fb2b56e5267a32c3aa21fb399e905308de470eb4515)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompiler-1.6.2104-o3de-rev1-mac           TARGETS DirectXShaderCompilerDxc   PACKAGE_HASH 4e97484f8fcf73fc39f22fc85ae86933a8f2e3ba0748fcec128bce05795035a6)
-ly_associate_package(PACKAGE_NAME azslc-1.7.21-rev1-multiplatform                        TARGETS azslc                      PACKAGE_HASH 772b7a2d9cc68aa1da4f0ee7db57ee1b4e7a8f20b81961fc5849af779582f4df)
-ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                     TARGETS glad                       PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
-ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                        TARGETS lux_core                   PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
-ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform                        TARGETS xxhash                     PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
-ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform                   TARGETS PVRTexTool                 PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
+ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform                     TARGETS zlib                        PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
+ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                  TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
+ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                    TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
+ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                 TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                   TARGETS assimplib                   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
+ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform            TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
+ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform         TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
+ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                             TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
+ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform                     TARGETS RapidJSON                   PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
+ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform                       TARGETS RapidXML                    PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
+ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform                 TARGETS pybind11                    PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
+ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                        TARGETS cityhash                    PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
+ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                            TARGETS lz4                         PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
+ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                         TARGETS expat                       PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
+ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                           TARGETS zstd                        PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
+ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                  TARGETS SQLite                      PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
+ly_associate_package(PACKAGE_NAME azslc-1.7.21-rev1-multiplatform                   TARGETS azslc                       PACKAGE_HASH 772b7a2d9cc68aa1da4f0ee7db57ee1b4e7a8f20b81961fc5849af779582f4df)
+ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                TARGETS glad                        PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
+ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                   TARGETS lux_core                    PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
+ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform                   TARGETS xxhash                      PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
+ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform              TARGETS PVRTexTool                  PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
 
 # platform-specific:
-ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios         TARGETS freetype        PACKAGE_HASH 67b4f57aed92082d3fd7c16aa244a7d908d90122c296b0a63f73e0a0b8761977)
-ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-mac-ios              TARGETS tiff            PACKAGE_HASH a23ae1f8991a29f8e5df09d6d5b00d7768a740f90752cef465558c1768343709)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-mac      TARGETS AWSNativeSDK    PACKAGE_HASH 21920372e90355407578b45ac19580df1463a39a25a867bcd0ffd8b385c8254a)
-ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev6-mac                 TARGETS Lua             PACKAGE_HASH b9079fd35634774c9269028447562c6b712dbc83b9c64975c095fd423ff04c08)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-mac      TARGETS PhysX           PACKAGE_HASH 149f5e9b44bd27291b1c4772f5e89a1e0efa88eef73c7e0b188935ed4d0c4a70)
-ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-mac       TARGETS etc2comp        PACKAGE_HASH 1966ab101c89db7ecf30984917e0a48c0d02ee0e4d65b798743842b9469c0818)
-ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-mac           TARGETS mcpp            PACKAGE_HASH 48a9c5197bf72843fb9ac44825501ee16bbe3e72e086a32b8c9c05bf47db12ab)
-ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac              TARGETS mikkelsen       PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505)
-ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac          TARGETS googletest      PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8)
-ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-mac     TARGETS GoogleBenchmark PACKAGE_HASH ad25de0146769c91e179953d845de2bec8ed4a691f973f47e3eb37639381f665)
-ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-mac            TARGETS OpenSSL         PACKAGE_HASH 28adc1c0616ac0482b2a9d7b4a3a3635a1020e87b163f8aba687c501cf35f96c)
-ly_associate_package(PACKAGE_NAME qt-5.15.2-rev3-mac                 TARGETS Qt              PACKAGE_HASH 4723ac43b19d4633c3fa4b9642f27c992d30cdc689f769f82869786f1c22a728)
-ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-mac       TARGETS libsamplerate   PACKAGE_HASH b912af40c0ac197af9c43d85004395ba92a6a859a24b7eacd920fed5854a97fe)
+ly_associate_package(PACKAGE_NAME DirectXShaderCompilerDxc-1.6.2104-o3de-rev2-mac   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH 2bede9a7ef3573027c005e38139237559eebf845c13ffb54c33c5b8675f962e2)
+ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-mac                    TARGETS SPIRVCross                  PACKAGE_HASH 78c6376ed2fd195b9b1f5fb2b56e5267a32c3aa21fb399e905308de470eb4515)
+ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-mac-ios                        TARGETS freetype                    PACKAGE_HASH 67b4f57aed92082d3fd7c16aa244a7d908d90122c296b0a63f73e0a0b8761977)
+ly_associate_package(PACKAGE_NAME tiff-4.2.0.15-mac-ios                             TARGETS tiff                        PACKAGE_HASH a23ae1f8991a29f8e5df09d6d5b00d7768a740f90752cef465558c1768343709)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-mac                     TARGETS AWSNativeSDK                PACKAGE_HASH 21920372e90355407578b45ac19580df1463a39a25a867bcd0ffd8b385c8254a)
+ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev6-mac                                TARGETS Lua                         PACKAGE_HASH b9079fd35634774c9269028447562c6b712dbc83b9c64975c095fd423ff04c08)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-mac                     TARGETS PhysX                       PACKAGE_HASH 149f5e9b44bd27291b1c4772f5e89a1e0efa88eef73c7e0b188935ed4d0c4a70)
+ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-mac                      TARGETS etc2comp                    PACKAGE_HASH 1966ab101c89db7ecf30984917e0a48c0d02ee0e4d65b798743842b9469c0818)
+ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-mac                          TARGETS mcpp                        PACKAGE_HASH 48a9c5197bf72843fb9ac44825501ee16bbe3e72e086a32b8c9c05bf47db12ab)
+ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-mac                             TARGETS mikkelsen                   PACKAGE_HASH 83af99ca8bee123684ad254263add556f0cf49486c0b3e32e6d303535714e505)
+ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-mac                         TARGETS googletest                  PACKAGE_HASH cbf020d5ef976c5db8b6e894c6c63151ade85ed98e7c502729dd20172acae5a8)
+ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-mac                    TARGETS GoogleBenchmark             PACKAGE_HASH ad25de0146769c91e179953d845de2bec8ed4a691f973f47e3eb37639381f665)
+ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev1-mac                           TARGETS OpenSSL                     PACKAGE_HASH 28adc1c0616ac0482b2a9d7b4a3a3635a1020e87b163f8aba687c501cf35f96c)
+ly_associate_package(PACKAGE_NAME qt-5.15.2-rev3-mac                                TARGETS Qt                          PACKAGE_HASH 4723ac43b19d4633c3fa4b9642f27c992d30cdc689f769f82869786f1c22a728)
+ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-mac                      TARGETS libsamplerate               PACKAGE_HASH b912af40c0ac197af9c43d85004395ba92a6a859a24b7eacd920fed5854a97fe)
diff --git a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
index 8fc009c601..fa1326b63d 100644
--- a/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
+++ b/cmake/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
@@ -10,49 +10,49 @@
 #
 
 # shared by other platforms:
-ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform                          TARGETS zlib                       PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
-ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                       TARGETS ilmbase                    PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
-ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                         TARGETS hdf5                       PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
-ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                      TARGETS alembic                    PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
-ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                        TARGETS assimplib                  PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
-ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform                 TARGETS squish-ccr                 PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
-ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform              TARGETS ASTCEncoder                PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
-ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                                  TARGETS md5                        PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
-ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform                          TARGETS RapidJSON                  PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
-ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform                            TARGETS RapidXML                   PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
-ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform                      TARGETS pybind11                   PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
-ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                             TARGETS cityhash                   PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
-ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                                 TARGETS lz4                        PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
-ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                              TARGETS expat                      PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
-ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                                TARGETS zstd                       PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
-ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                       TARGETS SQLite                     PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
-ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-windows                     TARGETS SPIRVCross                 PACKAGE_HASH 7d601ea9d625b1d509d38bd132a1f433d7e895b16adab76bac6103567a7a6817)
-ly_associate_package(PACKAGE_NAME DirectXShaderCompiler-1.6.2104-o3de-rev1-windows       TARGETS DirectXShaderCompilerDxc   PACKAGE_HASH 2c60297758d73f7833911e5ae3006fe0b10ced6e0b1b54764b33ae2b86e0d41d)
-ly_associate_package(PACKAGE_NAME azslc-1.7.21-rev1-multiplatform                        TARGETS azslc                      PACKAGE_HASH 772b7a2d9cc68aa1da4f0ee7db57ee1b4e7a8f20b81961fc5849af779582f4df)
-ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                     TARGETS glad                       PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
-ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                        TARGETS lux_core                   PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
-ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform                        TARGETS xxhash                     PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
-ly_associate_package(PACKAGE_NAME Blast-1.1.7-rev1-multiplatform                         TARGETS Blast                      PACKAGE_HASH 36b8f393bcd25d0f85cfc7a831ebbdac881e6054c4f0735649966aa6aa86e6f0)
-ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform                   TARGETS PVRTexTool                 PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
+ly_associate_package(PACKAGE_NAME zlib-1.2.8-rev2-multiplatform                         TARGETS zlib                        PACKAGE_HASH e6f34b8ac16acf881e3d666ef9fd0c1aee94c3f69283fb6524d35d6f858eebbb)
+ly_associate_package(PACKAGE_NAME ilmbase-2.3.0-rev4-multiplatform                      TARGETS ilmbase                     PACKAGE_HASH 97547fdf1fbc4d81b8ccf382261f8c25514ed3b3c4f8fd493f0a4fa873bba348)
+ly_associate_package(PACKAGE_NAME hdf5-1.0.11-rev2-multiplatform                        TARGETS hdf5                        PACKAGE_HASH 11d5e04df8a93f8c52a5684a4cacbf0d9003056360983ce34f8d7b601082c6bd)
+ly_associate_package(PACKAGE_NAME alembic-1.7.11-rev3-multiplatform                     TARGETS alembic                     PACKAGE_HASH ba7a7d4943dd752f5a662374f6c48b93493df1d8e2c5f6a8d101f3b50700dd25)
+ly_associate_package(PACKAGE_NAME assimp-5.0.1-rev9-multiplatform                       TARGETS assimplib                   PACKAGE_HASH 448530277b51b145ca43b96becd0266e29ae210fc9e2b45f5afe85f301a040e7)
+ly_associate_package(PACKAGE_NAME squish-ccr-20150601-rev3-multiplatform                TARGETS squish-ccr                  PACKAGE_HASH c878c6c0c705e78403c397d03f5aa7bc87e5978298710e14d09c9daf951a83b3)
+ly_associate_package(PACKAGE_NAME ASTCEncoder-2017_11_14-rev2-multiplatform             TARGETS ASTCEncoder                 PACKAGE_HASH c240ffc12083ee39a5ce9dc241de44d116e513e1e3e4cc1d05305e7aa3bdc326)
+ly_associate_package(PACKAGE_NAME md5-2.0-multiplatform                                 TARGETS md5                         PACKAGE_HASH 29e52ad22c78051551f78a40c2709594f0378762ae03b417adca3f4b700affdf)
+ly_associate_package(PACKAGE_NAME RapidJSON-1.1.0-multiplatform                         TARGETS RapidJSON                   PACKAGE_HASH 18b0aef4e6e849389916ff6de6682ab9c591ebe15af6ea6017014453c1119ea1)
+ly_associate_package(PACKAGE_NAME RapidXML-1.13-multiplatform                           TARGETS RapidXML                    PACKAGE_HASH 510b3c12f8872c54b34733e34f2f69dd21837feafa55bfefa445c98318d96ebf)
+ly_associate_package(PACKAGE_NAME pybind11-2.4.3-rev2-multiplatform                     TARGETS pybind11                    PACKAGE_HASH d8012f907b6c54ac990b899a0788280857e7c93a9595405a28114b48c354eb1b)
+ly_associate_package(PACKAGE_NAME cityhash-1.1-multiplatform                            TARGETS cityhash                    PACKAGE_HASH 0ace9e6f0b2438c5837510032d2d4109125845c0efd7d807f4561ec905512dd2)
+ly_associate_package(PACKAGE_NAME lz4-r128-multiplatform                                TARGETS lz4                         PACKAGE_HASH d7b1d5651191db2c339827ad24f669d9d37754143e9173abc986184532f57c9d)
+ly_associate_package(PACKAGE_NAME expat-2.1.0-multiplatform                             TARGETS expat                       PACKAGE_HASH 452256acd1fd699cef24162575b3524fccfb712f5321c83f1df1ce878de5b418)
+ly_associate_package(PACKAGE_NAME zstd-1.35-multiplatform                               TARGETS zstd                        PACKAGE_HASH 45d466c435f1095898578eedde85acf1fd27190e7ea99aeaa9acfd2f09e12665)
+ly_associate_package(PACKAGE_NAME SQLite-3.32.2-rev3-multiplatform                      TARGETS SQLite                      PACKAGE_HASH dd4d3de6cbb4ce3d15fc504ba0ae0587e515dc89a25228037035fc0aef4831f4)
+ly_associate_package(PACKAGE_NAME azslc-1.7.21-rev1-multiplatform                       TARGETS azslc                       PACKAGE_HASH 772b7a2d9cc68aa1da4f0ee7db57ee1b4e7a8f20b81961fc5849af779582f4df)
+ly_associate_package(PACKAGE_NAME glad-2.0.0-beta-rev2-multiplatform                    TARGETS glad                        PACKAGE_HASH ff97ee9664e97d0854b52a3734c2289329d9f2b4cd69478df6d0ca1f1c9392ee)
+ly_associate_package(PACKAGE_NAME lux_core-2.2-rev5-multiplatform                       TARGETS lux_core                    PACKAGE_HASH c8c13cf7bc351643e1abd294d0841b24dee60e51647dff13db7aec396ad1e0b5)
+ly_associate_package(PACKAGE_NAME xxhash-0.7.4-rev1-multiplatform                       TARGETS xxhash                      PACKAGE_HASH e81f3e6c4065975833996dd1fcffe46c3cf0f9e3a4207ec5f4a1b564ba75861e)
+ly_associate_package(PACKAGE_NAME Blast-1.1.7-rev1-multiplatform                        TARGETS Blast                       PACKAGE_HASH 36b8f393bcd25d0f85cfc7a831ebbdac881e6054c4f0735649966aa6aa86e6f0)
+ly_associate_package(PACKAGE_NAME PVRTexTool-4.24.0-rev4-multiplatform                  TARGETS PVRTexTool                  PACKAGE_HASH d0d6da61c7557de0d2c71fc35ba56c3be49555b703f0e853d4c58225537acf1e)
 
 # platform-specific:
-ly_associate_package(PACKAGE_NAME AWSGameLiftServerSDK-3.4.1-rev1-windows                TARGETS AWSGameLiftServerSDK       PACKAGE_HASH a0586b006e4def65cc25f388de17dc475e417dc1e6f9d96749777c88aa8271b0)
-ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-windows         TARGETS freetype        PACKAGE_HASH 88dedc86ccb8c92f14c2c033e51ee7d828fa08eafd6475c6aa963938a99f4bf3)
-ly_associate_package(PACKAGE_NAME tiff-4.2.0.14-windows              TARGETS tiff            PACKAGE_HASH ab60d1398e4e1e375ec0f1a00cdb1d812a07c0096d827db575ce52dd6d714207)
-ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-windows  TARGETS AWSNativeSDK    PACKAGE_HASH 929873d4252c464620a9d288e41bd5d47c0bd22750aeb3a1caa68a3da8247c48)
-ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-windows             TARGETS Lua             PACKAGE_HASH 136faccf1f73891e3fa3b95f908523187792e56f5b92c63c6a6d7e72d1158d40)
-ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-windows  TARGETS PhysX           PACKAGE_HASH 198bed89d1aae7caaf5dadba24cee56235fe41725d004b64040d4e50d0f3aa1a)
-ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-windows   TARGETS etc2comp        PACKAGE_HASH fc9ae937b2ec0d42d5e7d0e9e8c80e5e4d257673fb33bc9b7d6db76002117123)
-ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-windows       TARGETS mcpp            PACKAGE_HASH 511672598fa319bfb8db87f965b59abff1620bb7c1dcf7669e039a8acd8d3ff8)
-ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-windows          TARGETS mikkelsen       PACKAGE_HASH 872c4d245a1c86139aa929f2b465b63ea4ea55b04ced50309135dd4597457a4e)
-ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-windows      TARGETS googletest      PACKAGE_HASH 7e8f03ae8a01563124e3daa06386f25a2b311c10bb95bff05cae6c41eff83837)
-ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-windows TARGETS GoogleBenchmark PACKAGE_HASH 0c94ca69ae8e7e4aab8e90032b5c82c5964410429f3dd9dbb1f9bf4fe032b1d4)
-ly_associate_package(PACKAGE_NAME d3dx12-headers-rev1-windows        TARGETS d3dx12          PACKAGE_HASH 088c637159fba4a3e4c0cf08fb4921906fd4cca498939bd239db7c54b5b2f804)
-ly_associate_package(PACKAGE_NAME pyside2-qt-5.15.1-rev2-windows     TARGETS pyside2         PACKAGE_HASH c90f3efcc7c10e79b22a33467855ad861f9dbd2e909df27a5cba9db9fa3edd0f)
-ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev2-windows  TARGETS OpenImageIO     PACKAGE_HASH 85a2a6cf35cbc4c967c56ca8074babf0955c5b490c90c6e6fd23c78db99fc282)
-ly_associate_package(PACKAGE_NAME qt-5.15.2-rev2-windows             TARGETS Qt              PACKAGE_HASH 29966f22ec253dc9904e88ad48fe6b6a669302b2dc7049f2e2bbd4949e79e595)
-ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows   TARGETS libsamplerate   PACKAGE_HASH dcf3c11a96f212a52e2c9241abde5c364ee90b0f32fe6eeb6dcdca01d491829f)
-ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows          TARGETS OpenMesh        PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
-ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows          TARGETS civetweb        PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
-ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows        TARGETS OpenSSL         PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
-ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-rev1-windows        TARGETS Crashpad        PACKAGE_HASH d162aa3070147bc0130a44caab02c5fe58606910252caf7f90472bd48d4e31e2)
+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-rev2-windows   TARGETS DirectXShaderCompilerDxc    PACKAGE_HASH decc53e97c7ddda9c7f853a30af7808a7b652a912f59ad2cd4bca5d308aae2c4)
+ly_associate_package(PACKAGE_NAME SPIRVCross-2021.04.29-rev1-windows                    TARGETS SPIRVCross                  PACKAGE_HASH 7d601ea9d625b1d509d38bd132a1f433d7e895b16adab76bac6103567a7a6817)
+ly_associate_package(PACKAGE_NAME freetype-2.10.4.14-windows                            TARGETS freetype                    PACKAGE_HASH 88dedc86ccb8c92f14c2c033e51ee7d828fa08eafd6475c6aa963938a99f4bf3)
+ly_associate_package(PACKAGE_NAME tiff-4.2.0.14-windows                                 TARGETS tiff                        PACKAGE_HASH ab60d1398e4e1e375ec0f1a00cdb1d812a07c0096d827db575ce52dd6d714207)
+ly_associate_package(PACKAGE_NAME AWSNativeSDK-1.7.167-rev3-windows                     TARGETS AWSNativeSDK                PACKAGE_HASH 929873d4252c464620a9d288e41bd5d47c0bd22750aeb3a1caa68a3da8247c48)
+ly_associate_package(PACKAGE_NAME Lua-5.3.5-rev5-windows                                TARGETS Lua                         PACKAGE_HASH 136faccf1f73891e3fa3b95f908523187792e56f5b92c63c6a6d7e72d1158d40)
+ly_associate_package(PACKAGE_NAME PhysX-4.1.0.25992954-rev1-windows                     TARGETS PhysX                       PACKAGE_HASH 198bed89d1aae7caaf5dadba24cee56235fe41725d004b64040d4e50d0f3aa1a)
+ly_associate_package(PACKAGE_NAME etc2comp-9cd0f9cae0-rev1-windows                      TARGETS etc2comp                    PACKAGE_HASH fc9ae937b2ec0d42d5e7d0e9e8c80e5e4d257673fb33bc9b7d6db76002117123)
+ly_associate_package(PACKAGE_NAME mcpp-2.7.2_az.1-rev1-windows                          TARGETS mcpp                        PACKAGE_HASH 511672598fa319bfb8db87f965b59abff1620bb7c1dcf7669e039a8acd8d3ff8)
+ly_associate_package(PACKAGE_NAME mikkelsen-1.0.0.4-windows                             TARGETS mikkelsen                   PACKAGE_HASH 872c4d245a1c86139aa929f2b465b63ea4ea55b04ced50309135dd4597457a4e)
+ly_associate_package(PACKAGE_NAME googletest-1.8.1-rev4-windows                         TARGETS googletest                  PACKAGE_HASH 7e8f03ae8a01563124e3daa06386f25a2b311c10bb95bff05cae6c41eff83837)
+ly_associate_package(PACKAGE_NAME googlebenchmark-1.5.0-rev2-windows                    TARGETS GoogleBenchmark             PACKAGE_HASH 0c94ca69ae8e7e4aab8e90032b5c82c5964410429f3dd9dbb1f9bf4fe032b1d4)
+ly_associate_package(PACKAGE_NAME d3dx12-headers-rev1-windows                           TARGETS d3dx12                      PACKAGE_HASH 088c637159fba4a3e4c0cf08fb4921906fd4cca498939bd239db7c54b5b2f804)
+ly_associate_package(PACKAGE_NAME pyside2-qt-5.15.1-rev2-windows                        TARGETS pyside2                     PACKAGE_HASH c90f3efcc7c10e79b22a33467855ad861f9dbd2e909df27a5cba9db9fa3edd0f)
+ly_associate_package(PACKAGE_NAME openimageio-2.1.16.0-rev2-windows                     TARGETS OpenImageIO                 PACKAGE_HASH 85a2a6cf35cbc4c967c56ca8074babf0955c5b490c90c6e6fd23c78db99fc282)
+ly_associate_package(PACKAGE_NAME qt-5.15.2-rev2-windows                                TARGETS Qt                          PACKAGE_HASH 29966f22ec253dc9904e88ad48fe6b6a669302b2dc7049f2e2bbd4949e79e595)
+ly_associate_package(PACKAGE_NAME libsamplerate-0.2.1-rev2-windows                      TARGETS libsamplerate               PACKAGE_HASH dcf3c11a96f212a52e2c9241abde5c364ee90b0f32fe6eeb6dcdca01d491829f)
+ly_associate_package(PACKAGE_NAME OpenMesh-8.1-rev1-windows                             TARGETS OpenMesh                    PACKAGE_HASH 1c1df639358526c368e790dfce40c45cbdfcfb1c9a041b9d7054a8949d88ee77)
+ly_associate_package(PACKAGE_NAME civetweb-1.8-rev1-windows                             TARGETS civetweb                    PACKAGE_HASH 36d0e58a59bcdb4dd70493fb1b177aa0354c945b06c30416348fd326cf323dd4)
+ly_associate_package(PACKAGE_NAME OpenSSL-1.1.1b-rev2-windows                           TARGETS OpenSSL                     PACKAGE_HASH 9af1c50343f89146b4053101a7aeb20513319a3fe2f007e356d7ce25f9241040)
+ly_associate_package(PACKAGE_NAME Crashpad-0.8.0-rev1-windows                           TARGETS Crashpad                    PACKAGE_HASH d162aa3070147bc0130a44caab02c5fe58606910252caf7f90472bd48d4e31e2)
diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index f6a36afc89..8aba6ccb99 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -46,6 +46,7 @@ define_property(TARGET PROPERTY GEM_MODULE
 #
 # \arg:NAME name of the target
 # \arg:STATIC (bool) defines this target to be a static library
+# \arg:GEM_STATIC (bool) defines this target to be a static library while also setting the GEM_MODULE property
 # \arg:SHARED (bool) defines this target to be a dynamic library
 # \arg:MODULE (bool) defines this target to be a module library
 # \arg:GEM_MODULE (bool) defines this target to be a module library while also marking the target as a "Gem" via the GEM_MODULE property
@@ -76,7 +77,7 @@ define_property(TARGET PROPERTY GEM_MODULE
 # \arg:AUTOGEN_RULES a set of AutoGeneration rules to be passed to the AzAutoGen expansion system
 function(ly_add_target)
 
-    set(options STATIC SHARED MODULE GEM_MODULE HEADERONLY EXECUTABLE APPLICATION UNKNOWN IMPORTED AUTOMOC AUTOUIC AUTORCC NO_UNITY)
+    set(options STATIC GEM_STATIC SHARED MODULE GEM_MODULE HEADERONLY EXECUTABLE APPLICATION UNKNOWN IMPORTED AUTOMOC AUTOUIC AUTORCC NO_UNITY)
     set(oneValueArgs NAME NAMESPACE OUTPUT_SUBDIRECTORY OUTPUT_NAME)
     set(multiValueArgs FILES_CMAKE GENERATED_FILES INCLUDE_DIRECTORIES COMPILE_DEFINITIONS BUILD_DEPENDENCIES RUNTIME_DEPENDENCIES PLATFORM_INCLUDE_FILES TARGET_PROPERTIES AUTOGEN_RULES)
 
@@ -96,6 +97,10 @@ function(ly_add_target)
     if(ly_add_target_GEM_MODULE)
         set(ly_add_target_MODULE ${ly_add_target_GEM_MODULE})
     endif()
+    # If the GEM_STATIC tag is passed mark the target as STATIC
+    if(ly_add_target_GEM_STATIC)
+        set(ly_add_target_STATIC ${ly_add_target_GEM_STATIC})
+    endif()
 
     foreach(file_cmake ${ly_add_target_FILES_CMAKE})
         ly_include_cmake_file_list(${file_cmake})
@@ -199,7 +204,7 @@ function(ly_add_target)
 
     endif()
 
-    if(ly_add_target_GEM_MODULE)
+    if(ly_add_target_GEM_MODULE OR ly_add_target_GEM_STATIC)
         set_target_properties(${ly_add_target_NAME} PROPERTIES GEM_MODULE TRUE)
     endif()
 
@@ -719,3 +724,23 @@ function(ly_project_add_subdirectory project_name)
        endif()
     endif()
 endfunction()
+
+# given a target name, returns the "real" name of the target if its an alias.
+# this function recursively de-aliases
+function(ly_de_alias_target target_name output_variable_name)
+    # its not okay to call get_target_property on a non-existent target
+    if (NOT TARGET ${target_name})
+        message(FATAL_ERROR "ly_de_alias_target called on non-existent target: ${target_name}")
+    endif()
+
+    while(target_name)
+        set(de_aliased_target_name ${target_name})
+
+        get_target_property(target_name ${target_name} ALIASED_TARGET)
+    endwhile()
+
+    if(NOT de_aliased_target_name)
+        message(FATAL_ERROR "Empty de_aliased for ${target_name}")
+    endif()
+    set(${output_variable_name} ${de_aliased_target_name} PARENT_SCOPE)
+endfunction()
diff --git a/cmake/Monolithic.cmake b/cmake/Monolithic.cmake
index db45c182fd..dfd6816dde 100644
--- a/cmake/Monolithic.cmake
+++ b/cmake/Monolithic.cmake
@@ -14,7 +14,7 @@ set(LY_MONOLITHIC_GAME FALSE CACHE BOOL "Indicates if the game will be built mon
 if(LY_MONOLITHIC_GAME)
     add_compile_definitions(AZ_MONOLITHIC_BUILD)
     ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_LIBRARY_TYPE STATIC)
-    ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE STATIC)
+    ly_set(PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE GEM_STATIC)
     # Disable targets that are not supported with monolithic
     ly_set(PAL_TRAIT_BUILD_HOST_TOOLS FALSE)
     ly_set(PAL_TRAIT_BUILD_HOST_GUI_TOOLS FALSE)
diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index fbeffa94eb..84bad13687 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -17,6 +17,8 @@ endif()
 set(LY_INSTALLER_DOWNLOAD_URL "" CACHE STRING "URL embedded into the installer to download additional artifacts")
 set(LY_INSTALLER_LICENSE_URL "" CACHE STRING "Optionally embed a link to the license instead of raw text")
 
+set(CPACK_DESIRED_CMAKE_VERSION 3.20.2)
+
 # set all common cpack variable overrides first so they can be accessible via configure_file
 # when the platform specific settings are applied below.  additionally, any variable with
 # the "CPACK_" prefix will automatically be cached for use in any phase of cpack namely
@@ -38,6 +40,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_VER
 
 # neither of the SOURCE_DIR variables equate to anything during execution of pre/post build scripts
 set(CPACK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(CPACK_BINARY_DIR ${CMAKE_BINARY_DIR}/_CPack) # to match other CPack out dirs
 
 # attempt to apply platform specific settings
 ly_get_absolute_pal_filename(pal_dir ${CPACK_SOURCE_DIR}/Platform/${PAL_HOST_PLATFORM_NAME})
@@ -48,6 +51,53 @@ if(NOT CPACK_GENERATOR)
     return()
 endif()
 
+# pull down the desired copy of CMake so it can be included in the package
+if(NOT (CPACK_CMAKE_PACKAGE_FILE AND CPACK_CMAKE_PACKAGE_HASH))
+    message(FATAL_ERROR
+        "Packaging is missing one or more following properties required to include CMake: "
+        " CPACK_CMAKE_PACKAGE_FILE, CPACK_CMAKE_PACKAGE_HASH")
+endif()
+
+set(_cmake_package_dest ${CPACK_BINARY_DIR}/${CPACK_CMAKE_PACKAGE_FILE})
+
+string(REPLACE "." ";" _version_componets "${CPACK_DESIRED_CMAKE_VERSION}")
+list(GET _version_componets 0 _major_version)
+list(GET _version_componets 1 _minor_version)
+
+set(_url_version_tag "v${_major_version}.${_minor_version}")
+set(_package_url "https://cmake.org/files/${_url_version_tag}/${CPACK_CMAKE_PACKAGE_FILE}")
+
+message(STATUS "Ensuring CMake ${CPACK_DESIRED_CMAKE_VERSION} is available for packaging...")
+download_file(
+    URL ${_package_url}
+    TARGET_FILE ${_cmake_package_dest}
+    EXPECTED_HASH ${CPACK_CMAKE_PACKAGE_HASH}
+    RESULTS _results
+)
+list(GET _results 0 _status_code)
+
+if (${_status_code} EQUAL 0 AND EXISTS ${_cmake_package_dest})
+    message(STATUS "-> Package found and verified!")
+else()
+    file(REMOVE ${_cmake_package_dest})
+    list(REMOVE_AT _results 0)
+
+    set(_error_message "An error occurred, code ${_status_code}.  URL ${_package_url} - ${_results}")
+
+    if(${_status_code} EQUAL 1)
+        string(APPEND _error_message
+            "  Please double check the CPACK_CMAKE_PACKAGE_FILE and "
+            "CPACK_CMAKE_PACKAGE_HASH properties before trying again.")
+    endif()
+
+    message(FATAL_ERROR ${_error_message})
+endif()
+
+install(FILES ${_cmake_package_dest}
+    DESTINATION ./Tools/Redistributables/CMake
+    COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+)
+
 # IMPORTANT: required to be included AFTER setting all property overrides
 include(CPack REQUIRED)
 
diff --git a/cmake/Platform/Android/PAL_android.cmake b/cmake/Platform/Android/PAL_android.cmake
index bb4ac5f32b..5f35767f98 100644
--- a/cmake/Platform/Android/PAL_android.cmake
+++ b/cmake/Platform/Android/PAL_android.cmake
@@ -35,7 +35,7 @@ else()
 endif()
 
 # Set the default asset type for deployment
-set(LY_ASSET_DEPLOY_ASSET_TYPE "es3" CACHE STRING "Set the asset type for deployment.")
+set(LY_ASSET_DEPLOY_ASSET_TYPE "android" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
 if(PAL_HOST_PLATFORM_NAME_LOWERCASE STREQUAL "windows")
diff --git a/cmake/Platform/Mac/PAL_mac.cmake b/cmake/Platform/Mac/PAL_mac.cmake
index f6cf034312..988d36af14 100644
--- a/cmake/Platform/Mac/PAL_mac.cmake
+++ b/cmake/Platform/Mac/PAL_mac.cmake
@@ -35,7 +35,7 @@ else()
 endif()
 
 # Set the default asset type for deployment
-set(LY_ASSET_DEPLOY_ASSET_TYPE "osx_gl" CACHE STRING "Set the asset type for deployment.")
+set(LY_ASSET_DEPLOY_ASSET_TYPE "mac" CACHE STRING "Set the asset type for deployment.")
 
 # Set the python cmd tool
 ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)
diff --git a/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs b/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
new file mode 100644
index 0000000000..d4f6c181dd
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/PostInstallSetup.wxs
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<?include "cpack_variables.wxi"?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
+    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+    <Fragment>
+
+        <!-- RemoveFolderEx works on properties instead of directory references -->
+        <Property Id="INSTALLPATH">
+            <RegistrySearch Id="INSTALLPATH_REGSEARCH"
+                Root="HKLM"
+                Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)\$(var.CPACK_PACKAGE_VERSION)"
+                Name="Install Path"
+                Type="raw"/>
+        </Property>
+
+        <DirectoryRef Id="INSTALL_ROOT">
+            <!-- this will clear out any additional files as part of the installation that weren't originally
+                included of the MSI table -->
+            <Component Id="SanitizeInstallFolder" Guid="{85468941-52E6-4C04-A66D-8E3CA3BBF04A}">
+                <Condition><![CDATA[Installed OR NOT MANUALPRODUCTFOUND]]></Condition>
+                <util:RemoveFolderEx On="uninstall" Property="INSTALLPATH"/>
+
+                <!-- registry entry is required to properly initialize the property during uninstall-->
+                <RegistryValue Root="HKLM"
+                    Key="Software\$(var.CPACK_PACKAGE_VENDOR)\$(var.CPACK_PACKAGE_NAME)\$(var.CPACK_PACKAGE_VERSION)"
+                    Name="Install Path"
+                    Type="string"
+                    Value="[INSTALL_ROOT]"
+                    KeyPath="yes"/>
+            </Component>
+
+            <!-- installation directory references for use in post install commands -->
+            <Directory Id="root.cmake" Name="cmake">
+                <Directory Id="root.cmake.runtime" Name="runtime"/>
+            </Directory>
+            <Directory Id="root.python" Name="python"/>
+            <Directory Id="root.tools" Name="Tools">
+                <Directory Id="root.tools.redist" Name="Redistributables">
+                    <Directory Id="root.tools.redist.cmake" Name="CMake"/>
+                </Directory>
+            </Directory>
+        </DirectoryRef>
+
+        <CustomAction Id="ExtractCMake"
+            ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C tar -x -f &quot;[root.tools.redist.cmake]$(var.CPACK_CMAKE_PACKAGE_NAME).zip&quot; -C &quot;[root.tools.redist]CMake&quot;"
+            Directory="INSTALL_ROOT"
+            Execute="deferred"
+            Impersonate="no"/>
+
+        <CustomAction Id="MoveCMake"
+            ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C move &quot;[root.tools.redist.cmake]$(var.CPACK_CMAKE_PACKAGE_NAME)&quot; &quot;[root.cmake]runtime&quot;"
+            Directory="INSTALL_ROOT"
+            Execute="deferred"
+            Impersonate="no"/>
+
+        <CustomAction Id="ConfigurePython"
+            ExeCommand="&quot;[SystemFolder]cmd.exe&quot; /C set &quot;LY_CMAKE_PATH=[root.cmake.runtime]bin&quot; &amp;&amp; &quot;[root.python]get_python.bat&quot;"
+            Directory="INSTALL_ROOT"
+            Execute="deferred"
+            Impersonate="no"/>
+
+    </Fragment>
+</Wix>
diff --git a/cmake/Platform/Windows/Packaging/Template.wxs.in b/cmake/Platform/Windows/Packaging/Template.wxs.in
index 2900b96f41..e14e064fbc 100644
--- a/cmake/Platform/Windows/Packaging/Template.wxs.in
+++ b/cmake/Platform/Windows/Packaging/Template.wxs.in
@@ -17,8 +17,7 @@
         <!-- auto distribute the installable files across N cab files -->
         <MediaTemplate EmbedCab="$(var.CPACK_EMBED_ARTIFACTS)"/>
 
-        <MajorUpgrade
-            Schedule="afterInstallInitialize"
+        <MajorUpgrade Schedule="afterInstallInitialize"
             AllowSameVersionUpgrades="yes"
             DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>
 
@@ -41,8 +40,24 @@
         <FeatureRef Id="ProductFeature">
             <ComponentRef Id="DesktopShortcuts"/>
             <ComponentRef Id="StartMenuShortcuts"/>
+
+            <!-- for removing cmake and python on uninstall -->
+            <ComponentRef Id="SanitizeInstallFolder"/>
         </FeatureRef>
 
+        <InstallExecuteSequence>
+            <!-- limit the actions to first time install and repairs -->
+            <Custom Action="ExtractCMake" Before="InstallFinalize">
+                NOT Installed Or REINSTALL
+            </Custom>
+            <Custom Action="MoveCMake" After="ExtractCMake">
+                NOT Installed Or REINSTALL
+            </Custom>
+            <Custom Action="ConfigurePython" After="MoveCMake">
+                NOT Installed Or REINSTALL
+            </Custom>
+        </InstallExecuteSequence>
+
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
 
         <?include "properties.wxi"?>
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index ce73e9a07b..db9c7fc906 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -28,6 +28,10 @@ endif()
 
 set(CPACK_GENERATOR "WIX")
 
+set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64")
+set(CPACK_CMAKE_PACKAGE_FILE "${_cmake_package_name}.zip")
+set(CPACK_CMAKE_PACKAGE_HASH "15a49e2ab81c1822d75b1b1a92f7863f58e31f6d6aac1c4103eef2b071be3112")
+
 # CPack will generate the WiX product/upgrade GUIDs further down the chain if they weren't supplied
 # however, they are unique for each run.  instead, let's do the auto generation here and add it to
 # the cache for run persistence and have the ability to detect if they are still being used.
@@ -83,9 +87,14 @@ set(CPACK_WIX_PRODUCT_ICON ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/produc
 set(CPACK_WIX_TEMPLATE "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Template.wxs.in")
 
 set(CPACK_WIX_EXTRA_SOURCES
+    "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/PostInstallSetup.wxs"
     "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/Shortcuts.wxs"
 )
 
+set(CPACK_WIX_EXTENSIONS
+    WixUtilExtension
+)
+
 set(_embed_artifacts "yes")
 
 if(LY_INSTALLER_DOWNLOAD_URL)
@@ -101,4 +110,5 @@ endif()
 
 set(CPACK_WIX_CANDLE_EXTRA_FLAGS
     -dCPACK_EMBED_ARTIFACTS=${_embed_artifacts}
+    -dCPACK_CMAKE_PACKAGE_NAME=${_cmake_package_name}
 )
diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake
index fd5985a5a1..e1c07f4492 100644
--- a/cmake/SettingsRegistry.cmake
+++ b/cmake/SettingsRegistry.cmake
@@ -64,18 +64,16 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
     get_target_property(load_dependencies ${ly_TARGET} MANUALLY_ADDED_DEPENDENCIES)
     if(load_dependencies)
         foreach(load_dependency ${load_dependencies})
-            # Skip wrapping produced when targets are not created in the same directory 
-            if(NOT ${load_dependency} MATCHES "^::@")
-                get_property(dependency_type TARGET ${load_dependency} PROPERTY TYPE)
-                get_property(is_gem_target TARGET ${load_dependency} PROPERTY GEM_MODULE SET)
-                # If the dependency is a "gem module" then add it as a load dependencies
-                # and recurse into its manually added dependencies
-                if (is_gem_target)
-                    unset(dependencies)
-                    ly_get_gem_load_dependencies(dependencies ${load_dependency})
-                    list(APPEND all_gem_load_dependencies ${load_dependency})
-                    list(APPEND all_gem_load_dependencies ${dependencies})
-                endif()
+            # Skip wrapping produced when targets are not created in the same directory
+            ly_de_alias_target(${load_dependency} dealias_load_dependency)
+            get_property(is_gem_target TARGET ${dealias_load_dependency} PROPERTY GEM_MODULE SET)
+            # If the dependency is a "gem module" then add it as a load dependencies
+            # and recurse into its manually added dependencies
+            if (is_gem_target)
+                unset(dependencies)
+                ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency})
+                list(APPEND all_gem_load_dependencies ${dependencies})
+                list(APPEND all_gem_load_dependencies ${dealias_load_dependency})
             endif()
         endforeach()
     endif()
@@ -133,8 +131,8 @@ function(ly_delayed_generate_settings_registry)
                 file(RELATIVE_PATH gem_relative_source_dir ${ly_root_folder_cmake} ${gem_relative_source_dir})
             endif()
 
-             # Strip target namespace from gem targets before configuring them into the json template
-             ly_strip_target_namespace(TARGET ${gem_target} OUTPUT_VARIABLE stripped_gem_target)
+            # De-alias namespace from gem targets before configuring them into the json template
+            ly_de_alias_target(${gem_target} stripped_gem_target)
             string(CONFIGURE ${gem_module_template} gem_module_json @ONLY)
             list(APPEND target_gem_dependencies_names ${gem_module_json})
         endforeach()
diff --git a/cmake/Tools/Platform/Android/android_deployment.py b/cmake/Tools/Platform/Android/android_deployment.py
index 8a76270df1..eb8361ec18 100755
--- a/cmake/Tools/Platform/Android/android_deployment.py
+++ b/cmake/Tools/Platform/Android/android_deployment.py
@@ -62,7 +62,7 @@ class AndroidDeployment(object):
         :param deployment_type:         The type of deployment (DEPLOY_APK_ONLY, DEPLOY_ASSETS_ONLY, or DEPLOY_BOTH)
         :param game_name:               The name of the game whose assets are being deployed. None if is_test_project is True
         :param asset_mode:              The asset mode of deployment (LOOSE, PAK, VFS). None if is_test_project is True
-        :param asset_type:              The asset type (for android, 'es3'). None if is_test_project is True
+        :param asset_type:              The asset type. None if is_test_project is True
         :param embedded_assets:         Boolean to indicate if the assets are embedded in the APK or not
         :param is_unit_test:            Boolean to indicate if this is a unit test deployment
         """
diff --git a/cmake/Tools/Platform/Android/generate_android_project.py b/cmake/Tools/Platform/Android/generate_android_project.py
index f3f6a3acda..9a0e2760f5 100755
--- a/cmake/Tools/Platform/Android/generate_android_project.py
+++ b/cmake/Tools/Platform/Android/generate_android_project.py
@@ -118,7 +118,7 @@ ASSET_MODE_LOOSE = 'LOOSE'
 ASSET_MODE_VFS = 'VFS'
 ALL_ASSET_MODES = [ASSET_MODE_PAK, ASSET_MODE_LOOSE, ASSET_MODE_VFS]
 ASSET_TYPE_ARGUMENT_NAME = '--asset-type'
-DEFAULT_ASSET_TYPE = 'es3'
+DEFAULT_ASSET_TYPE = 'android'
 
 
 def wrap_parsed_args(parsed_args):
diff --git a/cmake/Tools/Platform/Android/unit_test_android_deployment.py b/cmake/Tools/Platform/Android/unit_test_android_deployment.py
index 011033649a..5ee168ca30 100755
--- a/cmake/Tools/Platform/Android/unit_test_android_deployment.py
+++ b/cmake/Tools/Platform/Android/unit_test_android_deployment.py
@@ -21,7 +21,7 @@ from cmake.Tools.Platform.Android import android_deployment
 TEST_GAME_NAME = "Foo"
 TEST_DEV_ROOT = pathlib.Path("Foo")
 TEST_ASSET_MODE = 'LOOSE'
-TEST_ASSET_TYPE = 'es3'
+TEST_ASSET_TYPE = 'android'
 TEST_ANDROID_SDK_PATH = pathlib.Path('c:\\AndroidSDK')
 TEST_BUILD_DIR = 'android_gradle_test'
 TEST_DEVICE_ID = '9A201FFAZ000ER'
@@ -661,10 +661,10 @@ def test_execute_success(tmpdir, test_config, test_package_name, test_device_sto
 
 @pytest.mark.parametrize(
     "test_game_name, test_config, test_package_name, test_device_storage_path, test_asset_type", [
-        pytest.param('game1','profile', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'es3'),
-        pytest.param('game1','debug', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'es3'),
-        pytest.param('game2','profile', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'es3'),
-        pytest.param('game2','debug', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'es3'),
+        pytest.param('game1','profile', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'android'),
+        pytest.param('game1','debug', 'com.amazon.lumberyard.foo', '/data/fool_storage', 'android'),
+        pytest.param('game2','profile', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'android'),
+        pytest.param('game2','debug', 'com.amazon.lumberyard.bar', '/data/fool_storage', 'android'),
         pytest.param('game3','profile', 'com.amazon.lumberyard.foo', '/data/fool_storage2', 'pc'),
         pytest.param('game3','debug', 'com.amazon.lumberyard.foo', '/data/fool_storage2', 'pc'),
         pytest.param('game4','profile', 'com.amazon.lumberyard.bar', '/data/fool_storage2', 'pc'),
diff --git a/cmake/Tools/common.py b/cmake/Tools/common.py
index b271c59766..8189bb3ca3 100755
--- a/cmake/Tools/common.py
+++ b/cmake/Tools/common.py
@@ -137,19 +137,32 @@ def get_config_file_values(config_file_path, keys_to_extract):
     return result_map
 
 
-def get_bootstrap_values(engine_root, keys_to_extract):
+def get_bootstrap_values(bootstrap_dir, keys_to_extract):
     """
-    Extract requested values from the bootstrap.cfg file in the def root folder
-    :param engine_root:         The engine root folder where bootstrap.cfg exists
+    Extract requested values from the bootstrap.setreg file in the Registry folder
+    :param bootstrap_dir:       The parent directory of the bootstrap.setreg file
     :param keys_to_extract:     The keys to extract into a dictionary
     :return: Dictionary of keys and its values (for matched keys)
     """
-    bootstrap_file = os.path.join(engine_root, 'bootstrap.cfg')
+    bootstrap_file = os.path.join(bootstrap_dir, 'bootstrap.setreg')
     if not os.path.isfile(bootstrap_file):
-        raise LmbrCmdError("Missing 'bootstrap.cfg' file from engine root ('{}')".format(engine_root),
-                           ERROR_CODE_FILE_NOT_FOUND)
+        raise logging.error(f'Bootstrap.setreg file {bootstrap_file} does not exist.')
+    
+    result_map = {}
+    with bootstrap_file.open('r') as f:
+        try:
+            json_data = json.load(f)
+        except Exception as e:
+            logging.error(f'Bootstrap.setreg failed to load: {str(e)}')
+        else:
+            for search_key in keys_to_extract:
+                try:
+                    search_result = json_data["Amazon"]["AzCore"]["Bootstrap"][f'"{search_key}"']
+                except KeyError as e:
+                    logging.error(f'Bootstrap.setreg cannot find Amazon:AzCore:Bootstrap:{search_result}: {str(e)}')
+                else:
+                    result_map[search_key] = search_result
     
-    result_map = get_config_file_values(bootstrap_file, keys_to_extract)
     return result_map
 
 
diff --git a/cmake/Tools/generate_game_paks.py b/cmake/Tools/generate_game_paks.py
deleted file mode 100755
index 6a1ff1e458..0000000000
--- a/cmake/Tools/generate_game_paks.py
+++ /dev/null
@@ -1,244 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-import argparse
-import datetime
-import logging
-import pathlib
-import platform
-import sys
-import os
-import subprocess
-
-ROOT_DEV_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..'))
-if ROOT_DEV_PATH not in sys.path:
-    sys.path.append(ROOT_DEV_PATH)
-
-from cmake.Tools import common
-
-# The location of this python script is not portable relative to the engine root, we determine the engine root based
-# on its relative location
-DEV_ROOT = os.path.realpath(os.path.join(__file__, '../../..'))
-
-BOOTSTRAP_CFG = os.path.join(DEV_ROOT, 'bootstrap.cfg')
-
-EXECUTABLE_EXTN = '.exe' if platform.system() == 'Windows' else ''
-RC_NAME = f'rc{EXECUTABLE_EXTN}'
-APB_NAME = f'AssetProcessorBatch{EXECUTABLE_EXTN}'
-
-# Depending on the user request for verbosity, the argument list to subprocess may or may not redirect stdout to NULL
-VERBOSE_CALL_ARGS = dict(
-    shell=True,
-    cwd=DEV_ROOT
-)
-NON_VERBOSE_CALL_ARGS = dict(
-    **VERBOSE_CALL_ARGS,
-    stdout=subprocess.DEVNULL
-)
-
-
-def command_arg(arg):
-    """
-    Work-around for an issue when running subprocess on Linux: subprocess.check_call will take in the argument as an array
-    but only invokes the first item in the array, ignoring the arguments. As quick fix, we will combine the array into the
-    full command line and execute it that way on non-windows platforms
-    """
-    if platform.system() == 'Windows':
-        return arg
-    else:
-        return ' '.join(arg)
-
-
-def validate(binfolder, game_name, pak_script):
-
-    #
-    # Validate the binfolder is relative and contains 'rc' and 'AssetProcessorBatch'
-    #
-    if os.path.isabs(binfolder):
-        raise common.LmbrCmdError("Invalid value for '-b/--binfolder'. It must be a path relative to the engine root folder",
-                                  common.ERROR_CODE_ERROR_DIRECTORY)
-
-    binfolder_abs_path = pathlib.Path(DEV_ROOT) / binfolder
-    if not binfolder_abs_path.is_dir():
-        raise common.LmbrCmdError("Invalid value for '-b/--binfolder'. Path does not exist or is not a directory",
-                                  common.ERROR_CODE_ERROR_DIRECTORY)
-
-    rc_check = binfolder_abs_path / RC_NAME
-    if not rc_check.is_file():
-        raise common.LmbrCmdError(f"Invalid value for '-b/--binfolder'. Path does not contain {RC_NAME}",
-                                  common.ERROR_CODE_ERROR_DIRECTORY)
-
-    apb_check = binfolder_abs_path / APB_NAME
-    if not apb_check.is_file():
-        raise common.LmbrCmdError(f"Invalid value for '-b/--binfolder'. Path does not contain {APB_NAME}",
-                                  common.ERROR_CODE_ERROR_DIRECTORY)
-
-    #
-    # Validate the game name represents a game project within the game engine
-    #
-    gamefolder_abs_path = pathlib.Path(DEV_ROOT) / game_name
-    if not gamefolder_abs_path.is_dir():
-        raise common.LmbrCmdError(f"Invalid value for '-g/--game-name'. No game '{game_name} exists.",
-                                  common.ERROR_CODE_ERROR_DIRECTORY)
-
-    project_json_path = gamefolder_abs_path / 'project.json'
-    if not project_json_path.is_file():
-        raise common.LmbrCmdError(
-            f"Invalid value for '-g/--game-name'. Folder '{game_name} is not a valid game project.",
-            common.ERROR_CODE_FILE_NOT_FOUND)
-
-    if not os.path.isfile(pak_script):
-        raise common.LmbrCmdError(f'Pak script file {pak_script} does not exist.',
-                                  common.ERROR_CODE_FILE_NOT_FOUND)
-
-
-def process(binfolder, game_name, asset_platform, autorun_assetprocessor, recompress, fastest_compression, target,
-            pak_script, warn_on_assetprocessor_error, verbose):
-
-    logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG if verbose else logging.INFO)
-
-    target_path_root_abs = pathlib.Path(DEV_ROOT) / target
-    if target_path_root_abs.is_file():
-        raise common.LmbrCmdError(f"Target '{target}' already exists as a file.",
-                                  common.ERROR_CODE_GENERAL_ERROR)
-    os.makedirs(target_path_root_abs.absolute(), exist_ok=True)
-
-    target_pak_folder_name = f'{game_name.lower()}_{asset_platform}_paks'
-    target_pak = target_path_root_abs / target_pak_folder_name
-
-    # Prepare the asset processor batch arguments and execute if requested
-    if autorun_assetprocessor:
-        ap_executable = os.path.join(binfolder, APB_NAME)
-        ap_cmd_args = [ap_executable,
-                       f'/gamefolder={game_name}',
-                       f'/platforms={asset_platform}']
-        logging.debug("Calling {}".format(' '.join(ap_cmd_args)))
-        try:
-            logging.info(f"Running {APB_NAME} on {game_name}")
-            start_time = datetime.datetime.now()
-
-            call_args = VERBOSE_CALL_ARGS if verbose else NON_VERBOSE_CALL_ARGS
-
-            subprocess.check_call(command_arg(ap_cmd_args),
-                                  **call_args)
-
-            total_time = datetime.datetime.now() - start_time
-            logging.info(f"Asset Processing Complete. Elapse: {total_time}")
-        except subprocess.CalledProcessError:
-            if warn_on_assetprocessor_error:
-                logging.warning('AssetProcessorBatch reported errors')
-            else:
-                raise common.LmbrCmdError("AssetProcessorBatch has one or more failed assets.",
-                                          common.ERROR_CODE_GENERAL_ERROR)
-
-    rc_executable = os.path.join(binfolder, RC_NAME)
-    rc_cmd_args = [rc_executable,
-                   f'/job={pak_script}',
-                   f'/p={asset_platform}',
-                   f'/game={game_name}',
-                   f'/trg={target_pak}']
-    if recompress:
-        rc_cmd_args.append('/recompress=1')
-    if fastest_compression:
-        rc_cmd_args.append('/use_fastest=1')
-    logging.debug("Calling {}".format(' '.join(rc_cmd_args)))
-
-    try:
-        logging.info(f"Running {APB_NAME} on {game_name}")
-        start_time = datetime.datetime.now()
-
-        call_args = VERBOSE_CALL_ARGS if verbose else NON_VERBOSE_CALL_ARGS
-
-        subprocess.check_call(command_arg(rc_cmd_args),
-                              **call_args)
-
-        total_time = datetime.datetime.now() - start_time
-        logging.info(f"Asset Processing Complete. Elapse: {total_time}")
-        logging.info(f"Pak files for {game_name} written to {target_pak}")
-
-    except subprocess.CalledProcessError as err:
-        raise common.LmbrCmdError(f"{RC_NAME} returned an error: {str(err)}.",
-                                  err.returncode)
-
-
-def main(args):
-
-    parser = argparse.ArgumentParser()
-
-    parser.add_argument('-b', '--binfolder',
-                        help='The relative location of the binary folder that contains the resource compiler and asset processor')
-
-    bootstrap = common.get_bootstrap_values(DEV_ROOT, ['project_path'])
-    parser.add_argument('-g', '--game-name',
-                        help='The name of the Game whose asset pak will be generated for',
-                        default=bootstrap.get('project_path'))
-
-    parser.add_argument('-p', '--asset-platform',
-                        help='The asset platform type to process')
-
-    parser.add_argument('-a', '--autorun-assetprocessor',
-                        help='Option to automatically invoke asset processor batch on the game before generating the pak',
-                        action='store_true')
-
-    parser.add_argument('-w', '--warn-on-assetprocessor-error',
-                        help='When -a/--autorun-assetprocessor is specified, warn on asset processor failure rather than aborting the process',
-                        action='store_true')
-
-    parser.add_argument('-r', '--recompress',
-                        action='store_true',
-                        help='If present, the ResourceCompiler (RC.exe) will decompress and compress back each PAK file '
-                             'found as they are transferred from the cache folder to the game_pc_pak folder.')
-    parser.add_argument('-fc', '--fastest-compression',
-                        action='store_true',
-                        help='As each file is being added to its PAK file, they will be compressed across all available '
-                             'codecs (ZLIB, ZSTD and LZ4) and the one with the fastest decompression time will be '
-                             'chosen. The default is to always use ZLIB')
-    parser.add_argument('--target',
-                        default='Pak',
-                        help='Specify a target folder for the pak files. (Default : Pak)')
-    parser.add_argument('--pak-script',
-                        default=f'{DEV_ROOT}/{os.path.normpath("Code/Tools/RC/Config/rc/RCJob_Generic_MakePaks.xml")}',
-                        help="The absolute path of the pak script configuration file to use to create the paks.")
-
-    parser.add_argument('-v', '--verbose',
-                        help='Enable debug messages',
-                        action='store_true')
-
-    parsed = parser.parse_args(args)
-
-    validate(binfolder=parsed.binfolder,
-             game_name=parsed.game_name,
-             pak_script=parsed.pak_script)
-
-    process(binfolder=parsed.binfolder,
-            game_name=parsed.game_name,
-            asset_platform=parsed.asset_platform,
-            autorun_assetprocessor=parsed.autorun_assetprocessor,
-            recompress=parsed.recompress,
-            fastest_compression=parsed.fastest_compression,
-            target=parsed.target,
-            pak_script=parsed.pak_script,
-            warn_on_assetprocessor_error=parsed.warn_on_assetprocessor_error,
-            verbose=parsed.verbose)
-
-
-if __name__ == '__main__':
-    try:
-        if not os.path.isfile(BOOTSTRAP_CFG):
-            raise common.LmbrCmdError("Invalid dev root, missing bootstrap.cfg.",
-                                      common.ERROR_CODE_FILE_NOT_FOUND)
-
-        main(sys.argv[1:])
-        exit(0)
-
-    except common.LmbrCmdError as err:
-        print(str(err), file=sys.stderr)
-        exit(err.code)
diff --git a/cmake/Tools/layout_tool.py b/cmake/Tools/layout_tool.py
index 8f573b61f5..69f5b34ae7 100755
--- a/cmake/Tools/layout_tool.py
+++ b/cmake/Tools/layout_tool.py
@@ -78,19 +78,19 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
         if remote_on_check is None:
             # Validate that if '<platform>_connect_to_remote is enabled, that the 'input_remote_ip' is not set to local host
             if input_remote_connect == '1' and input_remote_ip == LOCAL_HOST:
-                return _warn("'bootstrap.cfg' is configured to connect to Asset Processor remotely, but the 'remote_ip' "
+                return _warn("'bootstrap.setreg' is configured to connect to Asset Processor remotely, but the 'remote_ip' "
                              " is configured for LOCAL HOST")
         else:
             if remote_on_check:
                 # Verify we are set for remote AP connection
                 if input_remote_ip == LOCAL_HOST:
-                    return _warn(f"'bootstrap.cfg' is not configured for a remote Asset Processor connection (remote_ip={input_remote_ip})")
+                    return _warn(f"'bootstrap.setreg' is not configured for a remote Asset Processor connection (remote_ip={input_remote_ip})")
                 if input_remote_connect != '1':
-                    return _warn(f"'bootstrap.cfg' is not configured for a remote Asset Processor connection ({platform_name}_connect_to_remote={input_remote_connect}")
+                    return _warn(f"'bootstrap.setreg' is not configured for a remote Asset Processor connection ({platform_name}_connect_to_remote={input_remote_connect}")
             else:
                 # Verify we are disabled for remote AP connection
                 if input_remote_connect != '0':
-                    return _warn(f"'bootstrap.cfg' is not configured for a remote Asset Processor connection ({platform_name}_connect_to_remote={input_remote_connect}")
+                    return _warn(f"'bootstrap.setreg' is not configured for a remote Asset Processor connection ({platform_name}_connect_to_remote={input_remote_connect}")
 
         return 0
 
@@ -107,20 +107,15 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
     project_name_lower = project_path.lower()
     layout_path = pathlib.Path(layout_dir)
 
-    # Validate bootstrap.cfg exists
-    bootstrap_file = layout_path / 'bootstrap.cfg'
-    if not bootstrap_file.is_file():
-        warning_count += _warn(f"'bootstrap.cfg' is missing from {str(layout_path)}")
-        bootstrap_values = None
-    else:
-        bootstrap_values = common.get_config_file_values(str(bootstrap_file), [f'{platform_name_lower}_remote_filesystem',
-                                                                               f'{platform_name_lower}_connect_to_remote',
-                                                                               f'{platform_name_lower}_wait_for_connect',
-                                                                               f'{platform_name_lower}_assets',
-                                                                               f'assets',
-                                                                               f'{platform_name_lower}_remote_ip',
-                                                                               f'remote_ip'
-                                                                               ])
+    bootstrap_path = layout_path / 'Registry'
+    bootstrap_values = common.get_bootstrap_values(str(bootstrap_path), [f'{platform_name_lower}_remote_filesystem',
+                                                                         f'{platform_name_lower}_connect_to_remote',
+                                                                         f'{platform_name_lower}_wait_for_connect',
+                                                                         f'{platform_name_lower}_assets',
+                                                                         f'assets',
+                                                                         f'{platform_name_lower}_remote_ip',
+                                                                         f'remote_ip'
+                                                                         ])
 
     # Validate the system_{platform}_{asset type}.cfg exists
     platform_system_cfg_file = layout_path / f'system_{platform_name_lower}_{asset_type}.cfg'
@@ -141,9 +136,9 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
         # Validate that the asset type for the platform matches the one set for the build
         bootstrap_asset_type = bootstrap_values.get(f'{platform_name_lower}_assets') or bootstrap_values.get('assets')
         if not bootstrap_asset_type:
-            warning_count += _warn("'bootstrap.cfg' is missing specifications for asset type.")
+            warning_count += _warn("'bootstrap.setreg' is missing specifications for asset type.")
         elif bootstrap_asset_type != asset_type:
-            warning_count += _warn(f"The asset type specified in bootstrap.cfg ({bootstrap_asset_type}) does not match the asset type specified for this deployment({asset_type}).")
+            warning_count += _warn(f"The asset type specified in bootstrap.setreg ({bootstrap_asset_type}) does not match the asset type specified for this deployment({asset_type}).")
 
         # Validate that if '<platform>_connect_to_remote is enabled, that the 'remote_ip' is not set to local host
         warning_count += _validate_remote_ap(remote_ip, remote_connect, None)
@@ -211,7 +206,7 @@ def verify_layout(layout_dir, platform_name, project_path, asset_mode, asset_typ
             elif asset_mode == ASSET_MODE_VFS:
                 remote_file_system = bootstrap_values.get(f'{platform_name_lower}_remote_filesystem') or '0'
                 if not remote_file_system != '1':
-                    warning_count += _warn("Remote file system is not configured in bootstrap.cfg for VFS mode.")
+                    warning_count += _warn("Remote file system is not configured in bootstrap.setreg for VFS mode.")
                 else:
                     warning_count += _validate_remote_ap(remote_ip, remote_connect, True)
 
diff --git a/cmake/Tools/unit_test_common.py b/cmake/Tools/unit_test_common.py
index 58f89876c3..655c2a32c1 100755
--- a/cmake/Tools/unit_test_common.py
+++ b/cmake/Tools/unit_test_common.py
@@ -48,60 +48,6 @@ def test_determine_engine_root(tmpdir, engine_json_content, expected_success):
         assert result is None
 
 
-TEST_BOOTSTRAP_CONTENT_1 = """
-project_path = Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
---No Assets
-"""
-
-TEST_BOOTSTRAP_CONTENT_2 = """
-project_path = Game2
-  foo = bar
-#-------------------------
-  key1 = value1
-key2 = value2
-assets = pc
---No Assets
-"""
-
-
-@pytest.mark.parametrize(
-    "contents, input_keys, expected_result_map", [
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, ['project_path', 'foo', 'assets'], {'project_path': 'Game1',
-                                                                                      'foo': 'bar',
-                                                                                      'assets': 'pc'}, id="TestFullMatch"),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_2, ['project_path', 'foo', 'barnone'], {'project_path': 'Game2',
-                                                                                       'foo': 'bar'}, id="TestPartialMatch"),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_2, ['project_pathnone', 'foonone', 'barnone'], {}, id="TestNoMatch")
-    ]
-)
-def test_get_bootstrap_values_success(tmpdir, contents, input_keys, expected_result_map):
-    
-    test_dev_root = 'dev'
-    tmpdir.ensure('{}/bootstrap.cfg'.format(test_dev_root))
-    bootstrap_file = tmpdir.join('{}/bootstrap.cfg'.format(test_dev_root))
-    bootstrap_file.write(contents)
-
-    bootstrap_file_path = str(tmpdir.join(test_dev_root).realpath())
-    
-    result = common.get_bootstrap_values(bootstrap_file_path, input_keys)
-    
-    assert expected_result_map == result
-
-
-def test_get_bootstrap_values_fail():
-    try:
-        bad_file = 'x:\\foo\\bar\\file\\'
-        common.get_bootstrap_values(bad_file, ['input_keys'])
-    except common.LmbrCmdError as err:
-        assert 'Missing' in str(err)
-    else:
-        assert False, "Excepted LayoutToolError (missing file)"
-
-
 TEST_AP_CONFIG_1 = """
 [Platforms]
 ;pc=enabled
@@ -245,7 +191,6 @@ def test_verify_game_project_and_dev_root_success(tmpdir):
     game_name = 'MyFoo'
     game_folder = 'myfoo'
     game_project_json = TEST_GAME_PROJECT_JSON_FORMAT.format(project_name=game_name)
-    tmpdir.ensure(f'{dev_root}/bootstrap.cfg')
     tmpdir.ensure(f'{dev_root}/{game_folder}/project.json')
     project_json_path = tmpdir / dev_root / game_folder / 'project.json'
     project_json_path.write_text(game_project_json, encoding='ascii')
@@ -285,72 +230,6 @@ asset_deploy_type={test_asset_deploy_type}
     assert result.asset_deploy_type == test_asset_deploy_type
 
 
-def test_transform_bootstrap_project_path(tmpdir):
-
-    tmpdir.ensure('bootstrap.cfg')
-
-    test_bootstrap_content = """
--- Blah Blah
--- Blah Blah
-
-project_path=OldProject
-
--- remote_filesystem - enable Virtual File System (VFS)
--- This feature allows a remote instance of the game to run off assets
--- on the asset processor computers cache instead of deploying them the remote device
--- By default it is off and can be overridden for any platform
-remote_filesystem=0
-"""
-    test_src_bootstrap = tmpdir / 'bootstrap.cfg'
-    test_src_bootstrap.write_text(test_bootstrap_content, encoding='ascii')
-
-    test_dst_bootstrap = tmpdir / 'bootstrap.transformed.cfg'
-    test_game_name = 'FooBar'
-
-    common.transform_bootstrap_for_project(game_name=test_game_name,
-                                        src_bootstrap=str(test_src_bootstrap),
-                                        dst_bootstrap=str(test_dst_bootstrap))
-
-    transformed_text = test_dst_bootstrap.read_text('ascii')
-
-    search_gamename = re.search(r"project_path\s*=\s*(.*)", transformed_text)
-    assert search_gamename
-    assert search_gamename.group(1)
-    assert search_gamename.group(1) == test_game_name
-
-
-def test_transform_bootstrap_project_path_missing(tmpdir):
-
-    tmpdir.ensure('bootstrap.cfg')
-
-    test_bootstrap_content = """
--- Blah Blah
--- Blah Blah
-
--- remote_filesystem - enable Virtual File System (VFS)
--- This feature allows a remote instance of the game to run off assets
--- on the asset processor computers cache instead of deploying them the remote device
--- By default it is off and can be overridden for any platform
-remote_filesystem=0
-"""
-    test_src_bootstrap = tmpdir / 'bootstrap.cfg'
-    test_src_bootstrap.write_text(test_bootstrap_content, encoding='ascii')
-
-    test_dst_bootstrap = tmpdir / 'bootstrap.transformed.cfg'
-    test_game_name = 'FooBar'
-
-    common.transform_bootstrap_for_project(game_name=test_game_name,
-                                        src_bootstrap=str(test_src_bootstrap),
-                                        dst_bootstrap=str(test_dst_bootstrap))
-
-    transformed_text = test_dst_bootstrap.read_text('ascii')
-
-    search_gamename = re.search(r"project_path\s*=\s*(.*)", transformed_text)
-    assert search_gamename
-    assert search_gamename.group(1)
-    assert search_gamename.group(1) == test_game_name
-
-
 def test_cmake_dependency_success(tmpdir):
 
     test_module = 'FooBar'
diff --git a/cmake/Tools/unit_test_current_project.py b/cmake/Tools/unit_test_current_project.py
deleted file mode 100755
index 7db48b62aa..0000000000
--- a/cmake/Tools/unit_test_current_project.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the "License"). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-import os
-import pytest
-
-from . import current_project
-
-TEST_BOOTSTRAP_CONTENT_1 = """
-project_path = Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
-"""
-TEST_BOOTSTRAP_CONTENT_2 = """
-project_path=Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
-"""
-TEST_BOOTSTRAP_CONTENT_3 = """
-project_path= Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
-"""
-TEST_BOOTSTRAP_CONTENT_4 = """
-project_path =Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
-"""
-TEST_BOOTSTRAP_CONTENT_5 = """
-project_path           =                Game1
-foo = bar
-key1 = value1
-key2 = value2
-assets = pc
-"""
-
-@pytest.mark.parametrize(
-    "contents, expected_result", [
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, 'Game1'),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_2, 'Game1'),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_3, 'Game1'),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_4, 'Game1'),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_5, 'Game1'),
-    ]
-)
-def test_get_current_project(tmpdir, contents, expected_result):
-    dev_root = str(tmpdir.join('dev').realpath()).replace('\\', '/')
-    os.makedirs(dev_root, exist_ok=True)
-
-    bootstrap_file = f'{dev_root}/bootstrap.cfg'
-    if os.path.isfile(bootstrap_file):
-        os.unlink(bootstrap_file)
-    with open(bootstrap_file, 'a') as s:
-        s.write(contents)
-
-    result = current_project.get_current_project(dev_root)
-    assert expected_result == result
-
-
-@pytest.mark.parametrize(
-    "contents, project_to_set, expected_result", [
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, 'Test1', 0),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, ' Test2', 0),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, 'Test3 ', 0),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, '/Test4', 1),
-        pytest.param(TEST_BOOTSTRAP_CONTENT_1, '=Test5', 1),
-    ]
-)
-def test_set_current_project(tmpdir, contents, project_to_set, expected_result):
-    dev_root = str(tmpdir.join('dev').realpath()).replace('\\', '/')
-    os.makedirs(dev_root, exist_ok=True)
-
-    bootstrap_file = f'{dev_root}/bootstrap.cfg'
-    if os.path.isfile(bootstrap_file):
-        os.unlink(bootstrap_file)
-    with open(bootstrap_file, 'a') as s:
-        s.write(contents)
-
-    result = current_project.set_current_project(dev_root, project_to_set)
-    assert expected_result == result
-
-    if result == 0:
-        project_that_is_set = current_project.get_current_project(dev_root)
-        print(project_that_is_set)
-        print(project_to_set)
-        assert project_to_set.strip() == project_that_is_set
\ No newline at end of file
diff --git a/cmake/Tools/unit_test_layout_tool.py b/cmake/Tools/unit_test_layout_tool.py
index 5be2c23f11..37684654b1 100755
--- a/cmake/Tools/unit_test_layout_tool.py
+++ b/cmake/Tools/unit_test_layout_tool.py
@@ -212,16 +212,15 @@ def test_create_link_error():
 
 
 @pytest.mark.parametrize(
-    "project_path, asset_type, ensure_path, warn_on_missing, expected_result", [
-        pytest.param('Foo', 'pc', 'Foo/Cache/pc/bootstrap.cfg', False, 'Foo/Cache/pc'),
-        pytest.param('Foo', 'pc', 'dev/bootstrap.cfg', True, None),
-        pytest.param('Foo', 'pc', 'Foo/Cache/es3/bootstrap.cfg', True, None),
-        pytest.param('Foo', 'pc', 'dev/bootstrap.cfg', False, common.LmbrCmdError),
-        pytest.param('Foo', 'pc', 'Foo/Cache/es3/bootstrap.cfg', False, common.LmbrCmdError),
+    "project_path, asset_type, warn_on_missing, expected_result", [
+        pytest.param('Foo', 'pc', False, 'Foo/Cache/pc'),
+        pytest.param('Foo', 'pc', True, None),
+        pytest.param('Foo', 'pc', True, None),
+        pytest.param('Foo', 'pc', False, common.LmbrCmdError),
+        pytest.param('Foo', 'pc', False, common.LmbrCmdError),
     ]
 )
-def test_construct_and_validate_cache_game_asset_folder_success(tmpdir, project_path, asset_type, ensure_path, warn_on_missing, expected_result):
-    tmpdir.ensure(ensure_path)
+def test_construct_and_validate_cache_game_asset_folder_success(tmpdir, project_path, asset_type, warn_on_missing, expected_result):
     if isinstance(expected_result, str):
         expected_path_realpath = str(tmpdir.join(expected_result).realpath())
     elif expected_result == common.LmbrCmdError:
@@ -385,7 +384,6 @@ def test_sync_layout_non_vfs_success(tmpdir, mode, existing_game_link, existing_
     old_remove_link = layout_tool.remove_link
     try:
         # Simple Test Parameters
-        tmpdir.ensure('engine-root/bootstrap.cfg')
         engine_root_realpath = str(tmpdir.join('engine-root').realpath())
         test_project_path = str(tmpdir.join('Foo').realpath())
         test_project_name_lower = 'foo'
diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index d0fce80964..fe5e223612 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -99,7 +99,7 @@
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
         "ASSET_PROCESSOR_BINARY": "bin\\profile\\AssetProcessorBatch.exe",
         "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode --regset=\"/Amazon/AssetProcessor/Settings/Exclude Android/pattern=.*/DiffuseGlobalIllumination/.*precompiledshader\"",
-        "ASSET_PROCESSOR_PLATFORMS":"es3"
+        "ASSET_PROCESSOR_PLATFORMS":"android"
     }
   },
   "release": {
diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json
index c1646fc863..610c6a6514 100644
--- a/scripts/build/Platform/Linux/build_config.json
+++ b/scripts/build/Platform/Linux/build_config.json
@@ -83,7 +83,7 @@
       "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DLY_UNITY_BUILD=TRUE -DLY_PARALLEL_LINK_JOBS=4 -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -L FRAMEWORK_googletest"
+      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -LE SUITE_sandbox -L FRAMEWORK_googletest"
     }
   },
   "test_profile_nounity": {
@@ -95,7 +95,7 @@
       "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DLY_UNITY_BUILD=FALSE -DLY_PARALLEL_LINK_JOBS=4 -DO3DE_HOME_PATH=\"${WORKSPACE}/home\" -DO3DE_REGISTER_ENGINE_PATH=\"${WORKSPACE}/o3de\" -DO3DE_REGISTER_THIS_ENGINE=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "all",
-      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -L FRAMEWORK_googletest"
+      "CTEST_OPTIONS": "-E (Gem::EMotionFX.Editor.Tests|Gem::AWSClientAuth.Tests|Gem::AWSCore.Editor.Tests) -LE SUITE_sandbox -L FRAMEWORK_googletest"
     }
   },
   "asset_profile": {
diff --git a/scripts/build/Platform/Mac/build_config.json b/scripts/build/Platform/Mac/build_config.json
index f312279fe6..bcaffce880 100644
--- a/scripts/build/Platform/Mac/build_config.json
+++ b/scripts/build/Platform/Mac/build_config.json
@@ -86,7 +86,7 @@
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
       "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode",
-      "ASSET_PROCESSOR_PLATFORMS": "osx_gl"
+      "ASSET_PROCESSOR_PLATFORMS": "mac"
     }
   },
   "periodic_test_profile": {
diff --git a/scripts/build/lambda/trigger_first_build.py b/scripts/build/lambda/trigger_first_build.py
index 6ebe09f7ee..3b4587e737 100755
--- a/scripts/build/lambda/trigger_first_build.py
+++ b/scripts/build/lambda/trigger_first_build.py
@@ -53,7 +53,7 @@ def lambda_handler(event, context):
         backoff = 30
         status_list = [404]  # Retry if the branch doesn't exist yet and provide time for Jenkins to discover it.
         method_list = ['POST']
-        retry_config = Retry(total=retries, backoff_factor=backoff, status_forcelist=status_list, method_whitelist=method_list)
+        retry_config = Retry(total=retries, backoff_factor=backoff, status_forcelist=status_list, allowed_methods=method_list)
 
         session = requests.Session()
         session.mount('https://', HTTPAdapter(max_retries=retry_config))
diff --git a/scripts/build/package/package.py b/scripts/build/package/package.py
index 96b39f0753..4cb09f3918 100755
--- a/scripts/build/package/package.py
+++ b/scripts/build/package/package.py
@@ -25,9 +25,6 @@ from glob3 import glob
 def package(options):
     package_env = PackageEnv(options.platform, options.type, options.package_env)
 
-    # Override values in bootstrap.cfg for PC package
-    override_bootstrap_cfg(package_env)
-
     if not package_env.get('SKIP_BUILD'):
         print(package_env.get('SKIP_BUILD'))
         print('SKIP_BUILD is False, running CMake build...')
@@ -51,34 +48,6 @@ def get_python_path(package_env):
         return os.path.join(package_env.get('ENGINE_ROOT'), 'python', 'python.sh')
 
 
-def override_bootstrap_cfg(package_env):
-    print('Override values in bootstrap.cfg')
-    engine_root = package_env.get('ENGINE_ROOT')
-    bootstrap_path = os.path.join(engine_root, 'bootstrap.cfg')
-    replace_values = {'project_path':'{}'.format(package_env.get('BOOTSTRAP_CFG_GAME_FOLDER'))}
-    try:
-        with open(bootstrap_path, 'r') as bootstrap_cfg:
-            content = bootstrap_cfg.read()
-    except:
-        error('Cannot read file {}'.format(bootstrap_path))
-    content = content.split('\n')
-    new_content = []
-    for line in content:
-        if not line.startswith('--'):
-            strs = line.split('=')
-            if len(strs):
-                key = strs[0].strip(' ')
-                if key in replace_values:
-                    line = '{}={}'.format(key, replace_values[key])
-        new_content.append(line)
-    try:
-        with open(bootstrap_path, 'w') as out:
-            out.write('\n'.join(new_content))
-    except:
-        error('Cannot write to file {}'.format(bootstrap_path))
-    print('{} updated with value {}'.format(bootstrap_path, replace_values))
-
-
 def cmake_build(package_env):
     build_targets = package_env.get('BUILD_TARGETS')
     for build_target in build_targets:
diff --git a/scripts/bundler/gen_shaders.py b/scripts/bundler/gen_shaders.py
index 46857179b1..bfb60287af 100644
--- a/scripts/bundler/gen_shaders.py
+++ b/scripts/bundler/gen_shaders.py
@@ -163,11 +163,11 @@ def add_shaders_types():
     shaders.append(gl4)
 
     gles3 = _ShaderType('GLES3', 'GLSL_HLSLcc')
-    gles3.add_configuration('Android', 'es3')
+    gles3.add_configuration('Android', 'android')
     shaders.append(gles3)
 
     metal = _ShaderType('METAL', 'METAL_LLVM_DXC')
-    metal.add_configuration('Mac', 'osx_gl')
+    metal.add_configuration('Mac', 'mac')
     metal.add_configuration('iOS', 'ios')
     shaders.append(metal)
 
diff --git a/system_android_es3.cfg b/system_android_android.cfg
similarity index 93%
rename from system_android_es3.cfg
rename to system_android_android.cfg
index 46ab50f558..d5bfddeb73 100644
--- a/system_android_es3.cfg
+++ b/system_android_android.cfg
@@ -1,4 +1,4 @@
--- config file used when the android platform is running off 'es3' assets.
+-- config file used when the android platform is running off 'android' assets.
 sys_float_exceptions=0
 log_IncludeTime=1
 sys_PakLogInvalidFileAccess=1
diff --git a/system_mac_osx_gl.cfg b/system_mac_mac.cfg
similarity index 100%
rename from system_mac_osx_gl.cfg
rename to system_mac_mac.cfg